From 3935aa3e47e3e0deae23c7b25eda34e5c17a5670 Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Sat, 8 Feb 2020 19:30:55 +0000
Subject: [PATCH 1/2] fix conflict causing compile error

---
 code/game/objects/structures/stool_bed_chair_nest/bed.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 8ae9044d2c1..5b312e0c87f 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -46,12 +46,8 @@
 	// Base icon.
 	var/cache_key = "[base_icon]-[material.name]"
 	if(isnull(stool_cache[cache_key]))
-<<<<<<< HEAD
-		var/image/I = image(icon, base_icon) //VOREStation Edit
-		//var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so.
-=======
 		var/image/I = image(icon, base_icon)
->>>>>>> 792245a... Merge pull request #6665 from Woodratt/02022020_civilianmaptweak
+		//var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so.
 		if(applies_material_colour) //VOREStation Add - Goes with added var
 			I.color = material.icon_colour
 		stool_cache[cache_key] = I

From 22c0fd363f25ab734e1f8f362a17640658ba6978 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 8 Feb 2020 15:56:26 -0500
Subject: [PATCH 2/2] Update bed.dm

---
 code/game/objects/structures/stool_bed_chair_nest/bed.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 5b312e0c87f..d0de7a71eab 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -47,7 +47,6 @@
 	var/cache_key = "[base_icon]-[material.name]"
 	if(isnull(stool_cache[cache_key]))
 		var/image/I = image(icon, base_icon)
-		//var/image/I = image('icons/obj/furniture.dmi', base_icon) //From Polaris Sync. Not sure if this is a better way of doing it or not. Uncomment if so.
 		if(applies_material_colour) //VOREStation Add - Goes with added var
 			I.color = material.icon_colour
 		stool_cache[cache_key] = I
@@ -347,4 +346,4 @@
 	return // Doesn't care about material or anything else.
 
 /obj/structure/bed/alien/attackby(obj/item/weapon/W, mob/user)
-	return // No deconning.
\ No newline at end of file
+	return // No deconning.