fix merge

package.json

@@ -11,8 +11,6 @@
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "chart.js": "^2.7.3",
-        "vue-chartjs": "^3.4.0",
         "@fortawesome/fontawesome-free": "^5.7.2",
         "@mdi/font": "^2.5.94",
         "@vue/cli-plugin-babel": "^3.0.1",
@@ -24,6 +22,7 @@
         "bootstrap-sass": "^3.3.7",
         "browser-sync": "^2.26.3",
         "browser-sync-webpack-plugin": "^2.0.1",
+        "chart.js": "^2.7.3",
         "chartist": "0.11.0",
         "cross-env": "^5.1",
         "css-loader": "2.1.1",
@@ -53,18 +52,19 @@
         "vue": "^2.5.17",
         "vue-analytics": "^5.8.0",
         "vue-chartist": "^2.1.2",
+        "vue-chartjs": "^3.4.0",
         "vue-i18n": "^7.4.0",
+        "vue-image-lightbox": "^7.1.0",
+        "vue-lazyload": "^1.3.3",
         "vue-meta": "^1.5.2",
         "vue-router": "^3.0.1",
         "vue-style-loader": "^4.1.2",
         "vue-template-compiler": "^2.5.17",
+        "vue2-dropzone": "^3.6.0",
         "vuelidate": "^0.7.4",
         "vuetify": "^1.2.5",
         "vuex": "^3.0.1",
-        "vuex-router-sync": "^5.0.0",
-        "vue2-dropzone": "^3.6.0",
-        "vue-image-lightbox": "^7.1.0",
-        "vue-lazyload": "^1.3.3"
+        "vuex-router-sync": "^5.0.0"
     },
     "dependencies": {
         "vue-html-to-paper": "^1.1.0",