Merged with original, used Unix line endings