Fixed issue #357: Fix line endings merging issue