These changes don't feel right to me. It seems like the conflict file should preserve the line endings instead of normalize them all to crlf. Any thoughts?