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