Merge the pages with master