diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 9bfda7abb..4e63b97b1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -33,11 +33,7 @@ jobs:
       - name: Run Pyright
         uses: jakebailey/pyright-action@v1
         with:
-<<<<<<< HEAD
-          version: '1.1.235'
-=======
           version: '1.1.242'
->>>>>>> 5536ef1e (Update to pyright 1.1.242)
           warnings: false
           no-comments: ${{ matrix.python-version != '3.x' }}
 
diff --git a/discord/guild.py b/discord/guild.py
index 940be92b3..98c2e131d 100644
--- a/discord/guild.py
+++ b/discord/guild.py
@@ -3414,7 +3414,7 @@ class Guild(Hashable):
 
                 before = Object(id=int(entries[-1]['id']))
 
-            return data.get('users', []), entries, before, limit
+            return data, entries, before, limit
 
         async def _after_strategy(retrieve, after, limit):
             after_id = after.id if after else None