Applied dos2unix

merge and diff work better if line endings don't change. All I did was run dos2unix, so there are no code changes here