diff --git a/.gitattributes b/.gitattributes
index a0f17e5..2eefe2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-package.json merge=ours
\ No newline at end of file
+#package.json merge=ours
\ No newline at end of file