diff --git a/config.toml b/config.toml
index 973a8510f..c6fdb09d8 100644
--- a/config.toml
+++ b/config.toml
@@ -96,9 +96,5 @@ googleAnalytics = ""
   latexDashes = true
 
 [taxonomies]
-<<<<<<< HEAD
   tag = "tags"
-=======
-  tag = "tags"
-  category = ""
->>>>>>> bfb0257e17971af1cf5f2a21d325bc569acef75c
+  category = ""
\ No newline at end of file