Normalize line endings
fix conflicts