The merge should now be complete.