Change to use "keep" for line endings. This will retain double line endings from source.
Merge remote-tracking branch 'origin/master'