diff --git a/.eslintrc.js b/.eslintrc.js
index 22204d97d..c1fea62d0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,4 @@
 module.exports = {
-<<<<<<< HEAD
   root: true,
   env: {
     node: true
@@ -13,19 +12,4 @@ module.exports = {
   parserOptions: {
     parser: 'babel-eslint'
   }
-=======
-    root: true,
-    env: {
-        node: true
-    },
-    extends: ['plugin:vue/essential', '@vue/prettier'],
-    rules: {
-        'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-        'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-        'prettier/prettier': 'error',
-    },
-    parserOptions: {
-        parser: 'babel-eslint'
-    }
->>>>>>> origin/dev
 }