update page for page provider
merge conflict resolved