merge master and add verification_page