diff --git a/.gitignore b/.gitignore
index f5859dd..eac6fd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ todo.txt
 /packages
 /fif
 /fif.exe
+.idea/workspace.xml
+*.sync-conflict*
\ No newline at end of file