merge pages and master