Dialog
resolved conflict