diff --git a/NeoPatterns.h b/NeoPatterns.h
index 9b48d8b..ae04a40 100644
--- a/NeoPatterns.h
+++ b/NeoPatterns.h
@@ -36,13 +36,10 @@ class NeoPatterns : public Adafruit_NeoPixel
     void PlasmaUpdate();
     void Radar(float radarspeed = 0.5,float radarthickness = 1, uint8_t interval = 50);
     void RadarUpdate();
-<<<<<<< HEAD
     void ShowInput();
     void ShowInputUpdate();
-=======
     void Equalizer(uint8_t eqvalues[]);
     void setEqBar(uint8_t barid,uint8_t pvalue);
->>>>>>> cff73c87e375c2766ab0a7beebffd403d37b21d8
 
     void SetColor1(uint32_t color);
     void SetColor2(uint32_t color);