diff --git a/firmware.bin b/firmware.bin
index 5862d152..e56d9a25 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 2db7c109..8b40d4c1 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/ui/battery.c b/ui/battery.c
index b8648693..8a805f3a 100644
--- a/ui/battery.c
+++ b/ui/battery.c
@@ -24,7 +24,8 @@
 
 void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink)
 {
-	if (blink == 0) {
+	if (blink == 0)
+	{
 		memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
 	}
 	else 
@@ -48,12 +49,6 @@ void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned in
 			}
 		}
 	}
-<<<<<<< HEAD
-	else
-	if (blink == 0)
-		memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
-=======
->>>>>>> 6819aca561858ec310a18cf21769411a69cd01d7
 }
 
 void UI_DisplayBattery(const unsigned int level, const unsigned int blink)
diff --git a/ui/battery.h b/ui/battery.h
index 6f7e52b1..905aca35 100644
--- a/ui/battery.h
+++ b/ui/battery.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-void UI_DrawBattery(uint8_t* bitmap, const unsigned int level, const unsigned int blink);
+void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink);
 void UI_DisplayBattery(const unsigned int Level, const unsigned int blink);
 
 #endif