Made Portals use safer merging