diff --git a/src/Dezibot.cpp b/src/Dezibot.cpp
index 25f61c4..ef2e950 100644
--- a/src/Dezibot.cpp
+++ b/src/Dezibot.cpp
@@ -7,38 +7,23 @@
 #define SCL_PIN 2
 
 #include "Dezibot.h"
-<<<<<<< HEAD
 #include <SPI.h>
-
 #include <Adafruit_NeoPixel.h>
-
-
-
-
-#define GPIO_LED 48
-
-void Dezibot::begin(void) {
-=======
 #include <Wire.h>
 
+#define GPIO_LED 48
 Dezibot::Dezibot():multiColorLight(){};
 
 void Dezibot::begin(void) {
     Wire.begin(SDA_PIN,SCL_PIN);
     infraredLight.begin();
     lightDetection.begin();    
->>>>>>> remotes/origin/feature/#9-display
     motion.begin();
     lightDetection.begin();
     colorDetection.begin();
     multiColorLight.begin();
-<<<<<<< HEAD
     motionDetection.begin();
-    infraredLight.begin();
-}
-=======
     display.begin();
 };
 
 
->>>>>>> remotes/origin/feature/#9-display