From 7e1bd55f7c4cf10ce9d615f7fb4889de7d732072 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 4 Dec 2017 16:23:58 -0500
Subject: [PATCH] Update speedbike.dm

---
 code/modules/vehicles/speedbike.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm
index c4e9e17e11..e05504b0dc 100644
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -15,11 +15,7 @@
 	var/overlay_state = "cover_blue"
 	var/mutable_appearance/overlay
 
-<<<<<<< HEAD
-/obj/vehicle/space/speedbike/New()
-=======
 /obj/vehicle/ridden/space/speedbike/Initialize()
->>>>>>> 5182128... refactors riding datums to a component, vehicle refactor staging for mech overhaul (#32249)
 	. = ..()
 	overlay = mutable_appearance(icon, overlay_state, ABOVE_MOB_LAYER)
 	add_overlay(overlay)