Update brain_damage_lines.json

strings/brain_damage_lines.json

@@ -57,7 +57,6 @@
         "i will snatch erry motherfucker birthday",
         "the ai and borgs are mettacomming I think",
         "u just did the world a little bit more sad place for someone",
-<<<<<<< HEAD
         "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?"
 		"CEMISTRY SUKS!!!!!!!!",
 		"youed call her a toeugh bithc",
@@ -104,14 +103,6 @@
 		"iM NOT A FUWRRYY!!!",
 		"DON'T EVER TUCH ME",
 		"FOURTEEN INCHES SOFT!!!"
-=======
-        "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
-        "@pick(semicolon)N-NYAAAAAA~",
-        "@pick(bug)",
-        "@pick(semicolon)wtf??????????? @pick(bug)",
-        "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
-        "DON'T EVER TUCH ME"
->>>>>>> 2e28e4b... Merge pull request #32997 from ShizCalev/strings-fix
     ],
 
     "mutations": [