diff --git a/src/move.py b/src/move.py
index 0580f68..9858839 100644
--- a/src/move.py
+++ b/src/move.py
@@ -92,7 +92,6 @@ class Move:
         self._wheel_r.speed_set(24)
         self._wheel_l.run()
         self._wheel_r.run()
-<<<<<<< HEAD
 	while (not (self._bumper.value() or self._sensor.isRed() or self._sensor.isBlue())):
             self._wheel_l.speed_set(48 - self._sensor.getbrightness())
             self._wheel_r.speed_set(self._sensor.getbrightness())