Minor fix in solve-merge-and-rebase-conflicts