made user page
resolved merge conflict