Merge errors fixed
Multiple dialog flow controlled