Fix/conversation show modal

Fixes a bug when a conversation starts a trigger that shows a modal (which I found when trying to add an ending).  This branch is based on feature/conversation-checks because I changed the relevant code in that branch.