Change line endings back to UNIX, fix author merge.