fix merge and update halo from paranoid