added all info to users
fixed schema merge conflict