Defined .gitattributes to help in project merge