merge issues
i dont get line endings