added .gitattributes to handle merge strategies