Updates to Challenge Phase

Updates to Challenge Phase
Diplomacy Conflict check in

Diplomacy Conflict check in