Added .gitattributes to fix potential merge conflicts