diff --git a/.gitignore b/.gitignore
index c3c7137..c98a0cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ npm*
 *.gz
 
 # Other
+*_conflict-
 .notes.txt
 .idea
 *.ipr
diff --git a/.npmignore b/.npmignore
index 66f95b1..c4362ce 100644
--- a/.npmignore
+++ b/.npmignore
@@ -10,3 +10,4 @@ CVS
 npm-debug.log
 *.sublime-project
 *.sublime-workspace
+*_conflict-