diff --git a/index.js b/index.js
index 0245fd4..bb58d4b 100644
--- a/index.js
+++ b/index.js
@@ -2,7 +2,7 @@ module.exports = {
   extends: [
     './node.js',
     './promise.js',
-    './es6.js',
     './vue.js',
+    './es6.js',
   ],
 };
diff --git a/package-lock.json b/package-lock.json
index f92e0e8..8817b31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,10 +1,6 @@
 {
   "name": "@mapcreator/eslint-config",
-<<<<<<< HEAD
-  "version": "1.1.0",
-=======
-  "version": "1.0.6",
->>>>>>> 6d62ccbe587b1b92420c9d5ad1104131c1e967b8
+  "version": "1.1.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9d13104..78a995e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mapcreator/eslint-config",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Mapcreator eslint configs",
   "main": "index.js",
   "repository": "git@github.com:MapcreatorIO/eslint-config.git",
diff --git a/rules/es6/stylisticIssues.js b/rules/es6/stylisticIssues.js
index afc2281..9cd6ee3 100644
--- a/rules/es6/stylisticIssues.js
+++ b/rules/es6/stylisticIssues.js
@@ -85,4 +85,12 @@ module.exports = {
     'switch-colon-spacing': prod(),
     'template-tag-spacing': [prod(), 'always'],
   },
+  overrides: [
+    {
+      files: ['*.vue'],
+      rules: {
+        indent: 'off',
+      },
+    },
+  ],
 };