diff --git a/README.md b/README.md
index 90ac96b..1ff25b7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-# wol-dashboard
-
-=======
 # ⚡ Wake-on-LAN Dashboard
 
 A modern, self-hosted web dashboard to remotely power on PCs via Magic Packet.