fix for action window priority in conflict phase
fix for action window priority in conflict phase

jeremylarner/ringteki,gryffon/ringteki,gryffon/ringteki,jeremylarner/ringteki,jeremylarner/ringteki,gryffon/ringteki