diff --git a/.gitattributes  b/.gitattributes 
new file mode 100644
index 000000000..794cc5d97
--- /dev/null
+++ b/.gitattributes 	
@@ -0,0 +1 @@
+*.pyc merge=ours
\ No newline at end of file