diff --git a/temp.json b/temp.json
index e4d7f6f..d29b131 100644
--- a/temp.json
+++ b/temp.json
@@ -1,6 +1,4 @@
 {"keywords":[
-<<<<<<< HEAD
-=======
  {"keyword":"test"},
  {"keyword":"abc"},
  {"keyword":"foo"},
@@ -9,5 +7,4 @@
  {"keyword":"\\\# hash"},
  {"keyword":"\\\\"},
  {"keyword":"\\\\\# hashtesting"}
->>>>>>> 4d781ad2c9a562e693caf5d259f933c8c575ff21
 ]}