diff --git a/.gitignore b/.gitignore
index 7357244136..79647a02d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,11 +91,6 @@ importo.py
 
 *.djcache
 uwsgi.ini
-<<<<<<< HEAD
-=======
-
-disturbance/static/disturbance_vue/static/css/app.css
-disturbance/static/disturbance_vue/static/js/app.js
-disturbance/static/disturbance_vue/static/js/manifest.js
-disturbance/static/disturbance_vue/static/js/vendor.js
->>>>>>> upstream/disturbance_v3
+
+# npm locks
+*-lock.json