Fix line endings to prepare for merge