From 67d495c053ae73271cf188472c83cbd6bbcd96ba Mon Sep 17 00:00:00 2001
From: Leo <lzimann@users.noreply.github.com>
Date: Thu, 23 Nov 2017 09:48:03 -0200
Subject: [PATCH 1/2] Fixes strings runtime

---
 strings/brain_damage_lines.json |  9 +++++++++
 strings/hallucination.json      | 18 +++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json
index 5efd3ac9b2..3cb60e3d22 100644
--- a/strings/brain_damage_lines.json
+++ b/strings/brain_damage_lines.json
@@ -57,6 +57,7 @@
         "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",
@@ -103,6 +104,14 @@
 		"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": [
diff --git a/strings/hallucination.json b/strings/hallucination.json
index b28c70db4a..b277f8552f 100644
--- a/strings/hallucination.json
+++ b/strings/hallucination.json
@@ -57,7 +57,7 @@
 	"i'm not robust enough to fight you",
 	"who cares",
 	"i'll kill you later"
-    ]
+    ],
 
     "ling_names": [
 	"Alpha",
@@ -77,7 +77,7 @@
 	"Phi",
 	"Psi",
 	"Omega"
-    ]
+    ],
 
     "doubt": [
         "Why?",
@@ -110,7 +110,7 @@
         "It's here!",
         "Follow me!",
         "Follow me"
-    ]
+    ],
 
     "infection_advice": [
 	"stay away",
@@ -118,7 +118,7 @@
 	"be careful",
 	"help me",
 	"kill me"
-    ]
+    ],
 
     "people": [
 	"Captain",
@@ -132,7 +132,7 @@
 	"Viro",
 	"Qm",
 	"[target.first_name()]"
-    ]
+    ],
 
     "accusations": [
 	"rogue",
@@ -148,7 +148,7 @@
 	"a tator",
 	"a ling",
 	"a changeling"
-    ]
+    ],
 
     "threat": [
 	"Cult",
@@ -162,7 +162,7 @@
  	"Harm",
  	"I hear flashing",
  	"Help"
-    ]
+    ],
 
     "location": [
 	"bridge",
@@ -183,7 +183,7 @@
 	"botany",
 	"kitchen",
 	"the ai sat"
-    ]
+    ],
 
     "advice": [
 	"Hmm...not sure about that.",
@@ -196,7 +196,7 @@
 	"You should go somewhere else. Quickly.",
 	"Good luck. You'll need it.",
 	"You have my permission. Do it."
-    ]
+    ],
 
     "chemicals": [
 	"Ooze",

From de9cfb2b7c207e9f9163aec58358c8ddab8ad345 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Thu, 23 Nov 2017 19:14:21 -0500
Subject: [PATCH 2/2] Update brain_damage_lines.json

---
 strings/brain_damage_lines.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json
index 3cb60e3d22..5efd3ac9b2 100644
--- a/strings/brain_damage_lines.json
+++ b/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": [