new CLI option
repair bad merge