Remove todo.
Adapt zariz_merge_branch().