diff --git a/package.json b/package.json
index 0757425..e61b57a 100644
--- a/package.json
+++ b/package.json
@@ -5,11 +5,7 @@
   "main": "mia_ihm.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-<<<<<<< HEAD
-    "start": "nodemon app.js"
-=======
     "start": "nodemon mia_ihm.js"
->>>>>>> master
   },
   "author": "Laurent LE CORRE",
   "license": "ISC",