Update with merging rather than rebasing.