wrote server test for getting a user, skipped
fixed merge conflict