Let's try dos2unix before the merge