diff --git a/.gitignore b/.gitignore
index 046a206b..1e85d5fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,22 +6,11 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-<<<<<<< HEAD
-
-=======
-pnpm-lock.yaml
-package-lock.yaml
->>>>>>> develop
 node_modules
 dist
 dist-ssr
 *.local
-<<<<<<< HEAD
 pnpm-lock.yaml
-=======
-lib
-
->>>>>>> develop
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json
@@ -32,11 +21,5 @@ lib
 *.njsproj
 *.sln
 *.sw?
-<<<<<<< HEAD
-stats.html
 cache
 lib
-=======
-cache
-
->>>>>>> develop