fixed merge conflit and new page structure