Oops, finish the merge.