diff --git a/config.json b/config.json
index 0a4a2df8..ac86d4de 100644
--- a/config.json
+++ b/config.json
@@ -1195,7 +1195,6 @@
         "practices": [],
         "prerequisites": [],
         "difficulty": 3
-<<<<<<< HEAD
       },
       {
         "slug": "rotational-cipher",