Added Transparent mask for hexes which have conflicts to resolve.
Fixed Post-combat bug where other player marked resovled conflict as conflict