merge master and pages