updates to user from user and business schema
fixes merge conflicts in schema