ModalDialog Part III
Merge conflict