merging master into pages