Fixed up HotS conflict checks.