fix conflict markers in run-convert-one-dcb