fixed dialogue control flow
Merge branch 'local'