Phase two merge - merge should be complete~