more conflict and same checks
Merge pull request #15 from SixtusTheFifth/master

More Same and Conflict checks for HotS units