merge conflicts Halo