New lines consistency

Branch merge produced file with mixed kinds of line endings