On Resolving Non-determinism in Choreographies