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