diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 167468df4a79236d4587bfe8c7c385b927d620d0..b5d6e8c3ef096ce3be276a94b5ff304517d8eb08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ cache:
   paths:
     - node_modules/
 
-tslint:
+eslint:
   stage: codestyle
   tags:
     - nodejs
@@ -20,7 +20,7 @@ tslint:
   dependencies: []
   script:
     - npm install
-    - node_modules/tslint/bin/tslint -p ./tsconfig.json -c ./tslint.json --project
+    - node_modules/eslint/bin/eslint.js -c .eslintrc.js --ext .ts ./src
 
 unit_tests:
  stage: test
@@ -85,7 +85,7 @@ deploy_production:
   tags:
     - ssh
   dependencies:
-    - tslint
+    - eslint
     - ngbuild
   script:
     - eval $(ssh-agent -s)
diff --git a/package-lock.json b/package-lock.json
index 3b9bcb357b553bc46b3ccf57e1c59a3aa513a3f6..91b20ba4d57003b4397f0def3b5be85ddb06dcfe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,8 +1,9 @@
 {
   "name": "arsnova-lite",
   "version": "1.3.0-SNAPSHOT",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
+<<<<<<< HEAD
   "packages": {
     "": {
       "name": "arsnova-lite",
@@ -39603,6 +39604,8 @@
       "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
     }
   },
+=======
+>>>>>>> 34566eb7d7ffad54900220ba49d822a7268a862d
   "dependencies": {
     "@angular-devkit/architect": {
       "version": "0.1102.11",
@@ -53508,23 +53511,6 @@
         }
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "string-width": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -53555,6 +53541,23 @@
         "define-properties": "^1.1.3"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "strip-ansi": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",