Adding pages
fixed anchors
fixed conflicts
fixed conflicts