diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json
index f67dfc8d42..4a28998e2c 100644
--- a/strings/brain_damage_lines.json
+++ b/strings/brain_damage_lines.json
@@ -152,16 +152,13 @@
         "sybl",
         "mrs sybil",
         "mr basil",
-<<<<<<< HEAD
 		"sisadel",
 		"dullus",
 		"colon marhens",
 		"haylo",
-		"EEGEE"
-=======
+		"EEGEE",
         "mr terry",
         "berry"
->>>>>>> e9f0f8c... Merge pull request #33445 from MoreRobustThanYou/patch-36
     ],
 
     "create_verbs": [