Resolve rebase