Added small dialog
conflict resoloved
Dialog changes