line endings conflict resolved