Fix rebase/merge problem with previous commits.