try to fix merge conflicts with gitattributes