resolve-crlf-conflicts-test