merge conflicts halo