Normalizing line endings
Fixing merge conflicts