Prevent unnecessary merge conflicts with line endings