diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 3d2772b20c..4ecdf25253 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -86,11 +86,8 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
 		return
 
 	if(href_list["move"])
-<<<<<<< HEAD
 		if(z != ZLEVEL_STATION && shuttleId == "colony_drop")
-=======
 		if(!(z in GLOB.station_z_levels) && shuttleId == "colony_drop")
->>>>>>> 51c03bb... Merge pull request #30633 from KorPhaeron/missing)
 			to_chat(usr, "<span class='warning'>You can't move the base again!</span>")
 			return
 		var/shuttle_error = SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)
@@ -349,4 +346,4 @@ obj/docking_port/stationary/public_mining_dock
 #undef BAD_ZLEVEL
 #undef BAD_AREA
 #undef BAD_COORDS
-#undef ZONE_SET
\ No newline at end of file
+#undef ZONE_SET