Merge resolution.

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -119,11 +119,47 @@
 	icon_state = "folded"
 	w_class = 4.0 // Can't be put in backpacks. Oh well.
 
-	attack_self(mob/user)
+/obj/item/roller/attack_self(mob/user)
 		var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
 		R.add_fingerprint(user)
 		del(src)
 
+/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
+
+	if(istype(W,/obj/item/roller_holder))
+		var/obj/item/roller_holder/RH = W
+		if(!RH.held)
+			user << "\blue You collect the roller bed."
+			src.loc = RH
+			RH.held = src
+			return
+
+	..()
+
+/obj/item/roller_holder
+	name = "roller bed rack"
+	desc = "A rack for carrying a collapsed roller bed."
+	icon = 'icons/obj/rollerbed.dmi'
+	icon_state = "folded"
+	var/obj/item/roller/held
+
+/obj/item/roller_holder/New()
+	..()
+	held = new /obj/item/roller(src)
+
+/obj/item/roller_holder/attack_self(mob/user as mob)
+
+	if(!held)
+		user << "\blue The rack is empty."
+		return
+
+	user << "\blue You deploy the roller bed."
+	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
+	R.add_fingerprint(user)
+	del(held)
+	held = null
+
+
 /obj/structure/stool/bed/roller/Move()
 	..()
 	if(buckled_mob)