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