diff --git a/README.md b/README.md
index 84694b1..efa2b4d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Nukumizu Backend
 
 Remote server monitoring and command execution subsystem for [Komari](https://www.komari.wiki).
@@ -156,7 +155,4 @@ go build -o nukumizu-backend .
 
 ## License
 
-See [LICENSE](LICENSE).
-=======
-# nukumizu-backend
->>>>>>> b3a5a5bad12c5ad7119d7b1b41134830233cdf67
+See [LICENSE](LICENSE).
\ No newline at end of file