Merge pull request #62 from anima-wg/use-choice-for-conflicting-leaves

Merge pull request #62 from anima-wg/use-choice-for-conflicting-leaves #148