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