Merge master to pages