added dialogs
fixed merge yo