diff --git a/include/effects/big_clock.h b/include/effects/big_clock.h
index af639de..1e0abfd 100644
--- a/include/effects/big_clock.h
+++ b/include/effects/big_clock.h
@@ -18,13 +18,4 @@ protected:
 public:
     virtual void loop(uint16_t ms);
     String get_name() override { return "big_clock"; }
-};
-<<<<<<< HEAD:include/effects/big_clock.h
-=======
-
-class NightClockEffect : public BigClockEffect {
-private:
-	void _draw_border_pixel(accum88 pos, CRGB* color) { };
-	CRGB _get_color_font() { return CRGB(0x220000); }
-};
->>>>>>> ecf5998510bf1f8230d070cebccb4c89f95ce856:include/effect_big_clock.h
+};
\ No newline at end of file