Fix Halo conflict