merge in one page

merge in one page and updated email validation