diff --git a/.gitignore b/.gitignore
index 8b810dc..7eaee5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,10 @@ node_modules/
 .idea/
 *.log.*
 uploads/
+<<<<<<< HEAD
 dist/
+=======
+>>>>>>> ebbb570f89e87134730dca884691f902d5e49736
 package-lock.json
 *~
 .DS_Store
\ No newline at end of file