more about page work
solved merge conflicts