Resolve .gitattributes conflict before merge f84ed3a verified xraijobsimulator commited on 9 days ago