From c8788ed4f7fe06316efa614e4e340fbabf27d373 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Sun, 24 Dec 2017 22:50:33 -0800
Subject: [PATCH 1/2] adds handholding

---
 code/modules/mob/mob.dm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index b19af6342c..32b5284b3f 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -362,7 +362,11 @@
 
 		add_logs(src, M, "grabbed", addition="passive grab")
 		if(!supress_message)
+<<<<<<< HEAD
 			visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
+=======
+			visible_message("<span class='warning'>[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!</span>")
+>>>>>>> af87ed3... grammar
 		if(!iscarbon(src))
 			M.LAssailant = null
 		else

From 36d8ff181149c764dc01e7c57960091e0db921c4 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 27 Dec 2017 21:48:18 -0500
Subject: [PATCH 2/2] Update mob.dm

---
 code/modules/mob/mob.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 32b5284b3f..fdf454b514 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -362,11 +362,7 @@
 
 		add_logs(src, M, "grabbed", addition="passive grab")
 		if(!supress_message)
-<<<<<<< HEAD
-			visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
-=======
 			visible_message("<span class='warning'>[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!</span>")
->>>>>>> af87ed3... grammar
 		if(!iscarbon(src))
 			M.LAssailant = null
 		else