More Same and Conflict checks for HotS units