better error handling for /users and save vars and change @body to user
merge version conflict