ResolveConflicts bug fix

Logic guarding against the action stack being empty.