fix line endings
Fix merge conflict