diff --git a/glcd.h b/glcd.h
index c67541c9..75c47457 100644
--- a/glcd.h
+++ b/glcd.h
@@ -55,11 +55,7 @@ void lcdDrawRectString(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, const
 void lcdDrawCircle(uint16_t x, uint16_t y, uint16_t radius, uint8_t filled, uint16_t color);
 
 void lcdSetFontTransparency(uint8_t transparency);
-<<<<<<< HEAD
-void lcdSetFont(const uint8_t *fnt);
-=======
 void lcdSetFont(const uint8_t *newFont);
->>>>>>> cleanups
 void lcdDrawChar(char c);
 void lcdPutString(const char *str);
 void lcdDrawString(uint16_t x, uint16_t y, const char *str, uint16_t color, uint16_t bkcolor);