From a19314f27e9dbedbb4118685e98a440e57f083c7 Mon Sep 17 00:00:00 2001
From: Kaveh Vahedipour <kaveh@arangodb.com>
Date: Thu, 1 Sep 2016 07:20:22 +0000
Subject: [PATCH] geez

---
 arangod/Agency/Agent.cpp | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/arangod/Agency/Agent.cpp b/arangod/Agency/Agent.cpp
index f63b9220cc..2561ba4408 100644
--- a/arangod/Agency/Agent.cpp
+++ b/arangod/Agency/Agent.cpp
@@ -255,33 +255,20 @@ bool Agent::recvAppendEntriesRPC(
 
   MUTEX_LOCKER(mutexLocker, _ioLock);
 
-<<<<<<< HEAD
-  if (this->term() > term) {
-    if (leaderCommitIndex >= _lastCommitIndex) {
-=======
   if (this->term() > term) { // peer at higher term 
     if (leaderCommitIndex >= _lastCommitIndex) { // 
->>>>>>> fb6e651525ad11e915ba2f7ff9019fa052f8b4f4
       _constituent.follow(term);
     } else {
       LOG_TOPIC(WARN, Logger::AGENCY) << "I have a higher term than RPC caller.";
       return false;
     }
-<<<<<<< HEAD
-=======
-  }
-  
-  if (!_constituent.vote(term, leaderId, prevIndex, prevTerm, true)) {
-    LOG_TOPIC(WARN, Logger::AGENCY) << "Not voting for " << leaderId;
-    return false;
->>>>>>> fb6e651525ad11e915ba2f7ff9019fa052f8b4f4
   }
   
   if (!_constituent.vote(term, leaderId, prevIndex, prevTerm, true)) {
     LOG_TOPIC(WARN, Logger::AGENCY) << "Not voting for " << leaderId;
     return false;
   }
-
+  
   size_t nqs   = queries->slice().length();
 
   if (nqs > 0) {