diff --git a/arangod/Agency/Store.cpp b/arangod/Agency/Store.cpp
index ef7bb7f9f7..beee701c38 100644
--- a/arangod/Agency/Store.cpp
+++ b/arangod/Agency/Store.cpp
@@ -625,10 +625,6 @@ void Store::beginShutdown() {
 }
 
 void Store::clearTimeTable () {
-<<<<<<< HEAD
-=======
-
->>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
   for (auto it = _time_table.cbegin(); it != _time_table.cend(); ++it) {
     if (it->first < std::chrono::system_clock::now()) {
       query_t tmp = std::make_shared<Builder>();
@@ -641,10 +637,6 @@ void Store::clearTimeTable () {
       break;
     }
   }
-<<<<<<< HEAD
-=======
-
->>>>>>> 5caf02768c711fe1d811bb58d5451f86ac38b02f
 }
 
 
diff --git a/arangod/Agency/Store.h b/arangod/Agency/Store.h
index 753608c997..3e0ae642cb 100644
--- a/arangod/Agency/Store.h
+++ b/arangod/Agency/Store.h
@@ -71,7 +71,6 @@ typedef std::map<std::shared_ptr<Node>, TimePoint> TableTime;
 class Node {
   
 public:
-
   // @brief Slash-segemented path 
   typedef std::vector<std::string> PathType;
 
diff --git a/js/client/modules/@arangodb/testing.js b/js/client/modules/@arangodb/testing.js
index 32ec6381e2..a2b0b1930e 100644
--- a/js/client/modules/@arangodb/testing.js
+++ b/js/client/modules/@arangodb/testing.js
@@ -745,7 +745,7 @@ function runThere(options, instanceInfo, file) {
     }
 
     httpOptions.returnBodyOnError = true;
-
+    
     const reply = download(instanceInfo.url + "/_admin/execute?returnAsJSON=true",
       testCode,
       httpOptions);
@@ -828,7 +828,6 @@ function performTests(options, testList, testname) {
         }
 
         print("\n" + Date() + " arangod: Trying", te, "...");
-
         let reply = runThere(options, instanceInfo, te);
 
         if (reply.hasOwnProperty('status')) {
@@ -1781,7 +1780,7 @@ function startInstance(protocol, options, addArgs, testname, tmpDir) {
     instanceInfo.url = url;
   } else {
     instanceInfo.urls = instanceInfo.endpoints.map(endpointToURL);
-    url = instanceInfo.urls[0];
+    url = instanceInfo.urls[instanceInfo.urls.length - 1];
     instanceInfo.url = url;
   }