diff --git a/runtime/syntax/README.md b/runtime/syntax/README.md
index cb4df5ae..f27cdfc9 100644
--- a/runtime/syntax/README.md
+++ b/runtime/syntax/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Syntax Files
 
 Here are micro's syntax files.
@@ -67,4 +66,3 @@ Here is a list of the files that have been converted to properly use colorscheme
 
 Because the nano syntax files I have modified are distributed under the GNU GPLv3 license, these files are also distributed
 under that license. See [LICENSE](LICENSE).
->>>>>>> master