resolved conflicts by conversion CRLF to LF