HALO : fix Conflicts