fixed ALL dialogs :)
fixed conflicts