diff --git a/package.json b/package.json
index 2a2c38a..0ec01c2 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,51 @@
-<<<<<<< HEAD
-{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.12.0"}
-=======
-{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.13.0"}
->>>>>>> 6a6f479 (tagged as 1.13.0)
+{
+    "name": "cagette-pei",
+    "description": "le logiciel libre du circuit court",
+    "license": "AGPL-3.0",
+    "dependencies": {
+        "bootstrap": "^3.3.4",
+        "eonasdan-bootstrap-datetimepicker": "^4.7.14",
+        "geolib": "^2.0.24",
+        "haxe-modular": "^0.7.0",
+        "jquery": "^2.2.4",
+        "leaflet": "^1.3.1",
+        "react": "^15.6.1",
+        "react-bootstrap-typeahead": "1.4.2",
+        "react-datetime": "^2.9.0",
+        "react-dom": "^15.6.1",
+        "react-leaflet": "^1.8.0",
+        "react-places-autocomplete": "^6.0.2",
+        "react-router": "^4.2.0",
+        "react-router-dom": "^4.2.2"
+    },
+    "devDependencies": {
+        "babel-preset-es2015": "^6.24.1",
+        "babel-preset-react": "^6.24.1",
+        "babelify": "^7.3.0",
+        "browserify": "^14.4.0",
+        "cross-env": "^5.1.1",
+        "node-sass": "^4.5.3",
+        "npm-run-all": "^4.1.2",
+        "uglify-js": "^3.1.9",
+        "watchify": "^3.9.0"
+    },
+    "scripts": {
+        "build": "npm-run-all --parallel build:*",
+        "build:js": "haxe cagetteJs.hxml",
+        "build:sass": "node-sass www/css -o www/css",
+        "watch:sass": "npm run build:sass -- --watch",
+        "build2": "babel src -d lib",
+        "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d",
+        "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js",
+        "test": "haxe testsJS.hxml && node js/test/tests.js",
+        "prepush": "npm test"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/bablukid/cagette.git"
+    },
+    "bugs": {
+        "url": "https://github.com/bablukid/cagette/issues"
+    },
+    "version": "1.13.0"
+}
\ No newline at end of file