remove nasty DOS line endings that mess up code as result of merge