Refix merge