diff --git a/StateHandler/inc/StateHandler.h b/StateHandler/inc/StateHandler.h
index 1017dbb..48ce4d3 100644
--- a/StateHandler/inc/StateHandler.h
+++ b/StateHandler/inc/StateHandler.h
@@ -15,17 +15,12 @@
 #ifndef STATE_HANDLER_H_
 #define STATE_HANDLER_H_
 
-<<<<<<< HEAD
-=======
-#include "DigitalIoPin.h"
-#include "LiquidCrystal.h"
->>>>>>> a6b953c51fc0a0204b4a5f881a975ec5e9842c6f
 #include "Counter.h"
 #include "DigitalIoPin.h"
 #include "Event.h"
 #include "LiquidCrystal.h"
 
-    /** Buttons enumeration
+/** Buttons enumeration
  *
  * Current switch state is being passed
  * from main to StateHandler through
@@ -33,18 +28,20 @@
  * of the particular button.
  * */
 
-    enum _buttons {
-      /** Raises the bar up */
-      BUTTON_CONTROL_UP,
-      /** Raises the bar down */
-      BUTTON_CONTROL_DOWN,
-      /** Toggles the mode between auto and
+enum _buttons
+{
+  /** Raises the bar up */
+  BUTTON_CONTROL_UP,
+  /** Raises the bar down */
+  BUTTON_CONTROL_DOWN,
+  /** Toggles the mode between auto and
    *  manual, which changes the state */
-      BUTTON_CONTROL_TOG_MODE,
-      /** Optional button to toggle the
+  BUTTON_CONTROL_TOG_MODE,
+  /** Optional button to toggle the
    * activation of the current setting.
    * Not compulsory to be used. */
-      BUTTON_CONTROL_TOG_ACTIVE };
+  BUTTON_CONTROL_TOG_ACTIVE
+};
 
 enum _bars
 {
diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp
index 22f95c3..4846a03 100644
--- a/StateHandler/src/StateHandler.cpp
+++ b/StateHandler/src/StateHandler.cpp
@@ -48,24 +48,6 @@ StateHandler::getSetSpeed ()
   return (unsigned int)this->set[FAN_SPEED].getCurrent ();
 }
 
-void
-StateHandler::displaySet (unsigned int value1, unsigned int value2)
-{
-  // TODO
-  /**
-   * MANUAL MODE:
-   * ----------------
-   * SPEED: 20%
-   * PRESSURE: XXPa
-   * ----------------
-   * AUTO MODE:
-   * ----------------
-   * PRESSURE SET: 35Pa
-   * PRESSURE CUR: XXPa
-   * ----------------
-   */
-}
-
 void
 StateHandler::HandleState (const Event &event)
 {