resolve conflicting .gitattributes