added .gitattributes skipping README.md merge conflicts, always take ours