diff --git a/.gitignore b/.gitignore
index 4755b6c24..d88b7632a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-package-lock.json
-package.json
 # dependencies
 /node_modules
 /.pnp