diff --git a/.gitignore b/.gitignore
index 0d28ebc..df78ea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 vendor
 settings.php
 nbproject/private
-database.mwb.bak
\ No newline at end of file
+database.mwb.bak
+*.sync-conflict*
\ No newline at end of file