diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 679b03bb5b..e9a74b87c7 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -523,13 +523,8 @@ var/global/list/default_medbay_channels = list(
 
 	//Nothing handled any sort of remote radio-ing and returned before now, just squawk on this zlevel.
 	return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
-<<<<<<< refs/remotes/origin/master
-		  src, message_pieces, displayname, jobname, real_name, M.voice_name,
-		  filter_type, signal.data["compression"], using_map.get_map_levels(pos_z), connection.frequency, verb)
-=======
 		src, message_pieces, displayname, jobname, real_name, M.voice_name,
 		filter_type, signal.data["compression"], using_map.get_map_levels(pos_z), connection.frequency, verb)
->>>>>>> Various fixes while waiting on PR
 
 
 /obj/item/device/radio/hear_talk(mob/M, list/message_pieces, verb)