merge page with master