Merge.
Continue to edit rebase.