Merge pages with master