Maybe?

maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm

@@ -28723,15 +28723,10 @@
 /turf/open/floor/prison/darkbrownfull2,
 /area/lv522/indoors/c_block/mining)
 "pBz" = (
-<<<<<<< HEAD
-/obj/structure/machinery/door/airlock/hatch/cockpit/two{
+/obj/structure/machinery/door/airlock/hatch/cockpit/three{
 	dir = 1
 	},
-/turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down,
-=======
-/obj/structure/machinery/door/airlock/hatch/cockpit/three,
 /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down,
->>>>>>> cmss13-devs/master
 /area/lv522/landing_zone_forecon/UD6_Typhoon)
 "pBF" = (
 /obj/effect/decal/cleanable/dirt,
@@ -34955,8 +34950,6 @@
 /area/lv522/outdoors/colony_streets/central_streets)
 "ssn" = (
 /obj/structure/closet/crate,
-/obj/item/storage/pouch/pressurized_reagent_canister/revival,
-/obj/item/storage/pouch/pressurized_reagent_canister/revival,
 /turf/open/floor/prison/floor_marked,
 /area/lv522/indoors/lone_buildings/storage_blocks)
 "ssU" = (
@@ -36217,13 +36210,9 @@
 /turf/open/floor/plating,
 /area/lv522/indoors/c_block/garage)
 "sYh" = (
-<<<<<<< HEAD
-/obj/structure/machinery/door/airlock/hatch/cockpit/two{
+/obj/structure/machinery/door/airlock/hatch/cockpit/three{
 	dir = 1
 	},
-=======
-/obj/structure/machinery/door/airlock/hatch/cockpit/three,
->>>>>>> cmss13-devs/master
 /turf/open/shuttle/dropship/medium_grey_single_wide_up_to_down,
 /area/lv522/landing_zone_forecon/UD6_Tornado)
 "sYl" = (
@@ -38972,15 +38961,7 @@
 /turf/open/floor/prison,
 /area/lv522/indoors/a_block/security/glass)
 "ukT" = (
-<<<<<<< HEAD
-/turf/open/floor/prison/floor_marked,
 /area/lv522/indoors/lone_buildings/engineering)
-=======
-/obj/structure/closet/crate,
-/obj/item/storage/pouch/pressurized_reagent_canister/revival_peri,
-/turf/open/floor/prison/floor_plate,
-/area/lv522/indoors/lone_buildings/storage_blocks)
->>>>>>> cmss13-devs/master
 "ulh" = (
 /turf/closed/shuttle/dropship3/tornado{
 	icon_state = "3"