--- a/editor/libeditor/tests/test_bug674770-1.html
+++ b/editor/libeditor/tests/test_bug674770-1.html
@@ -37,27 +37,22 @@ function startTests() {
       linkShouldWork: false },
   ];
   var currentTest;
   function runNextTest() {
     localStorage.removeItem("clicked");
     currentTest = tests.shift();
     if (!currentTest) {
       SimpleTest.finish();
-<<<<<<< local
       return;
     }
     ok(true, currentTest.description + "Starting to test...");
     synthesizeMouseAtCenter(currentTest.target(), { button: 1 });
   }
-=======
-    }, 500);
-  }, 500);
-}
->>>>>>> other
+
 
   addEventListener("storage", function(e) {
     is(e.key, "clicked", currentTest.description + "Key should always be 'clicked'");
     is(e.newValue, "true", currentTest.description + "Value should always be 'true'");
     ok(currentTest.linkShouldWork, currentTest.description + "The click operation on the link " + (currentTest.linkShouldWork ? "should work" : "shouldn't work"));
     SimpleTest.executeSoon(runNextTest);
   }, false);