Resolve rebase error