diff --git a/test/unit/notify-path.html b/test/unit/notify-path.html
index 73d1a25ef9..2cc0d36322 100644
--- a/test/unit/notify-path.html
+++ b/test/unit/notify-path.html
@@ -1153,7 +1153,6 @@
     assert.strictEqual(el.array[3], 'orig3');
   });
 
-<<<<<<< HEAD
   test('link two objects', function() {
     var aChanged = 0;
     var bChanged = 0;