Prepare to merge new link mgt