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