diff --git a/start.sh b/start.sh
index ef62b42..3479320 100755
--- a/start.sh
+++ b/start.sh
@@ -3,8 +3,4 @@ git pull
 chmod 777 start.sh
 
 pm2 delete shizukana
-<<<<<<< HEAD
 pm2 start node --name shizukana -- index
-=======
-pm2 start node --name shizukana -- index
->>>>>>> 7de76a2a75600de393bda88d8893d31f40a4685c