Resolved merge conflicts, worked on page_policy.