commit changes
functional edit user info function implemented
resolved merge conflict