Halo conflict fix