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