diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 68f1ef4bfe4..663dee5db38 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -25,11 +25,7 @@
 	</rule>
 
     <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
-<<<<<<< HEAD
     <rule ref="Zend.Files.ClosingTag"/>
-=======
-    <!-- <rule ref="Zend.Files.ClosingTag"/> -->
->>>>>>> refs/remotes/origin/3.6
 
     <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->