fix diffconflicts with CRLF EOL files