diff --git a/arangod/Agency/Store.cpp b/arangod/Agency/Store.cpp
index 2efdf38b8e..beee701c38 100644
--- a/arangod/Agency/Store.cpp
+++ b/arangod/Agency/Store.cpp
@@ -637,10 +637,6 @@ void Store::clearTimeTable () {
       break;
     }
   }
-<<<<<<< HEAD
-=======
-
->>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
 }