diff --git a/.gitignore b/.gitignore
index 8a7aded..c86c21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,11 @@
 __pycache__/
 res/output/
-<<<<<<< HEAD
 res/input/*
 .vscode/*
 *.json
-=======
-res/input/
->>>>>>> 351dc2e6d0158a1b81601f48503f761ea4995e58
 *.pyc
 *.png
-debug.py
\ No newline at end of file
+debug.py
+build/
+run.spec
+dist/
\ No newline at end of file