Do not leave \r lying around
Fixed merge conflict