Updated relationships between pages and users.
Resolved merge conflict.