quickfix rebase