diff --git a/.gitignore b/.gitignore
index aa1467b25547fc72d1e718ab6c21ca34b3893e78..15928bf0140cdb5c28965f8a99a672d4a5b25527 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 node_modules
 .DS_Store
-<<<<<<< HEAD
 dist
-=======
->>>>>>> 8e27e4d91d171fdca6522f4297ff30d0fdedccd0
 dist-ssr
 *.local
 *-lock.yaml