diff --git a/code/controllers/autotransfer.dm b/code/controllers/autotransfer.dm
index fb1754be01..34b535c2f6 100644
--- a/code/controllers/autotransfer.dm
+++ b/code/controllers/autotransfer.dm
@@ -16,18 +16,15 @@ datum/controller/transfer_controller/Destroy()
 
 datum/controller/transfer_controller/proc/process()
 	currenttick = currenttick + 1
-<<<<<<< HEAD
-	if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES) //VOREStation Edit START
+	//VOREStation Edit START
+	if (round_duration_in_ticks >= shift_last_vote - 2 MINUTES) 
 		shift_last_vote = 999999999999 //Setting to a stupidly high number since it'll be not used again.
 		to_world("<b>Warning: This upcoming round-extend vote will be your ONLY extend vote. Wrap up your scenes in the next 60 minutes if the round is extended.</b>") //VOREStation Edit
 	if (round_duration_in_ticks >= shift_hard_end - 1 MINUTE)
 		init_shift_change(null, 1)
 		shift_hard_end = timerbuffer + config.vote_autotransfer_interval //If shuttle somehow gets recalled, let's force it to call again next time a vote would occur.
 		timerbuffer = timerbuffer + config.vote_autotransfer_interval //Just to make sure a vote doesn't occur immediately afterwords.
-	else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE) //VOREStation Edit END
-		vote.autotransfer()
-=======
-	if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
+	else if (round_duration_in_ticks >= timerbuffer - 1 MINUTE)
 		SSvote.autotransfer()
->>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE
+	//VOREStation Edit END
 		timerbuffer = timerbuffer + config.vote_autotransfer_interval
diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm
index 1aab6d8df8..5cd8d2ab08 100644
--- a/code/controllers/verbs.dm
+++ b/code/controllers/verbs.dm
@@ -131,7 +131,6 @@
 			debug_variables(chemistryProcess)
 			feedback_add_details("admin_verb", "DChem")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
-<<<<<<< HEAD
 	return
 
 /client/proc/debug_process_scheduler()
@@ -156,5 +155,3 @@
 	debug_variables(P)
 	feedback_add_details("admin_verb", "DProcCtrl")
 	message_admins("Admin [key_name_admin(usr)] is debugging the [controller] controller.")
-=======
->>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 4b503ce5d4..7424b514c4 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -44,10 +44,7 @@ var/global/datum/controller/gameticker/ticker
 	'sound/music/title2.ogg',\
 	'sound/music/clouds.s3m',\
 	'sound/music/space_oddity.ogg') //Ground Control to Major Tom, this song is cool, what's going on?
-<<<<<<< HEAD
-	*/
-=======
->>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE
+	*/ //VOREStation Edit End
 
 	send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
 
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 330ad9c322..8ef0fbb012 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -34,9 +34,11 @@
 			log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
 			message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
 			return
-		if(vote && vote.mode)
-			src << "<span class='danger'>OOC is not allowed during voting.</span>"
+		//VOREStation Add - No talking during voting
+		if(SSvote && SSvote.mode)
+			to_chat(src,"<span class='danger'>OOC is not allowed during voting.</span>")
 			return
+		//VOREStation Add End
 
 	log_ooc(msg, src)
 
diff --git a/vorestation.dme b/vorestation.dme
index f7a1a8c898..3e583eab4a 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -231,11 +231,8 @@
 #include "code\controllers\subsystems\persist_vr.dm"
 #include "code\controllers\subsystems\planets.dm"
 #include "code\controllers\subsystems\shuttles.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\controllers\subsystems\transcore_vr.dm"
-=======
 #include "code\controllers\subsystems\vote.dm"
->>>>>>> eee9c50... Merge pull request #5675 from kevinz000/PS_PORT_VOTE:polaris.dme
 #include "code\controllers\subsystems\xenoarch.dm"
 #include "code\datums\ai_law_sets.dm"
 #include "code\datums\ai_laws.dm"