diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index 672f44a..0000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "env": {
-        "commonjs": true,
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
-    },
-    "parserOptions": {
-        "ecmaVersion": 2018
-    },
-    "rules": {
-        "indent": [
-            "error",
-            4
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 5680a88..f4ea84c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,8 @@ node_modules
 .vscode
 yarn-error.log
 .eslintrc.json
-logs/*
\ No newline at end of file
+<<<<<<< HEAD
+logs/*
+=======
+logs
+>>>>>>> fc3b124d98ad8c63b35945e38560e1a6060cea2b