Fix lineends before merge.
Fix lineends before merge.