added logic to retrieve xbox user info
fixing merge conflicts in the db schema