diff --git a/test/delegatetest.html b/test/delegatetest.html
index 6479d26e..efc20681 100644
--- a/test/delegatetest.html
+++ b/test/delegatetest.html
@@ -229,14 +229,22 @@
 	$(document).bind("change", function(){
 		jQuery("#boundChange").blink();
 	});
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> Overwrite CRLF with LF
 	$("#text_submit").addSubmitTest("#textSubmit", true);
 	$("#password_submit").addSubmitTest("#passwordSubmit", true);
 	$("#submit_submit").addSubmitTest("#submitSubmit", true);
 	$(document).bind("submit", function(){
 		jQuery("#boundSubmit").blink();
 	});
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> Overwrite CRLF with LF
         </script>
     </body>
 </html>