clean up pages
commit after merge conflict