Fix cheeky icon port

code/game/machinery/pda_multicaster.dm

@@ -1,13 +1,8 @@
 /obj/machinery/pda_multicaster
 	name = "\improper PDA multicaster"
 	desc = "This machine mirrors messages sent to it to specific departments."
-<<<<<<< HEAD
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Edit
-	icon_state = "pdamulti" //VOREStation Edit
-=======
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "pdamulti"
->>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
 	density = 1
 	anchored = 1
 	circuit = /obj/item/weapon/circuitboard/telecomms/pda_multicaster
@@ -41,11 +36,7 @@
 	if(on)
 		icon_state = initial(icon_state)
 	else
-<<<<<<< HEAD
-		icon_state = "[initial(icon_state)]_off" //VOREStation Edit
-=======
 		icon_state = "[initial(icon_state)]_off"
->>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
 
 /obj/machinery/pda_multicaster/attackby(obj/item/I, mob/user)
 	if(I.is_screwdriver())

code/game/machinery/telecomms/broadcaster.dm

@@ -132,13 +132,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 /obj/machinery/telecomms/allinone
 	name = "Telecommunications Mainframe"
-<<<<<<< HEAD
-	//icon = 'icons/obj/stationobjs.dmi' //VOREStation Removal - use parent icon
-	icon_state = "allinone" //VOREStation Edit
-=======
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "allinone"
->>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
 	desc = "A compact machine used for portable subspace telecommuniations processing."
 	density = 1
 	use_power = USE_POWER_IDLE

code/modules/modular_computers/NTNet/NTNet_relay.dm

@@ -5,12 +5,7 @@
 	use_power = USE_POWER_ACTIVE
 	active_power_usage = 20000 //20kW, apropriate for machine that keeps massive cross-Zlevel wireless network operational.
 	idle_power_usage = 100
-<<<<<<< HEAD
-	icon = 'icons/obj/stationobjs_vr.dmi' //VOREStation Add
-	icon_state = "ntnet" //VOREStation Edit
-=======
 	icon_state = "ntnet"
->>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
 	anchored = 1
 	density = 1
 	circuit = /obj/item/weapon/circuitboard/ntnet_relay
@@ -36,15 +31,10 @@
 	return 1
 
 /obj/machinery/ntnet_relay/update_icon()
-	//VOREStation Edit
 	if(operable())
 		icon_state = initial(icon_state)
 	else
 		icon_state = "[initial(icon_state)]_off"
-<<<<<<< HEAD
-	//VOREStation Edit End
-=======
->>>>>>> 578ba46d... Merge pull request #7125 from Cerebulon/tcommsprites
 
 /obj/machinery/ntnet_relay/process()
 	if(operable())