Merge master/pages