dialogs are ready for real merge