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