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