fix merge issues due to CRLF