Resolving incorrect rebase