Commit unsaved changes
Normalize line endings
Merge changes
Merge branch 'line-changes'