fix merge conflict

docs/api.rst

@@ -2053,6 +2053,23 @@ of :class:`enum.Enum`.
         Represents the default avatar with the color red.
         See also :attr:`Colour.red`
 
+.. class:: StickerType
+
+    Represents the type of sticker images.
+
+    .. versionadded:: 1.6
+
+    .. attribute:: png
+
+        Represents a sticker with a png image.
+
+    .. attribute:: apng
+
+        Represents a sticker with an apng image.
+
+    .. attribute:: lottie
+
+        Represents a sticker with a lottie image.
 
 Async Iterator
 ----------------
@@ -2976,6 +2993,12 @@ Widget
 .. autoclass:: Widget()
     :members:
 
+Sticker
+~~~~~~~~~~~~~~~
+
+.. autoclass:: Sticker()
+    :members:
+
 MessageReference
 ~~~~~~~~~~~~~~~~~
 .. autoclass:: MessageReference()
@@ -3177,7 +3200,6 @@ PublicUserFlags
 .. autoclass:: PublicUserFlags()
     :members:
 
-
 Exceptions
 ------------
 

docs/intents.rst

@@ -19,6 +19,7 @@ The intents that are necessary for your bot can only be dictated by yourself. Ea
 For example, if you want a bot that functions without spammy events like presences or typing then we could do the following:
 
 .. code-block:: python3
+   :emphasize-lines: 7,9,10
 
     import discord
     intents = discord.Intents.default()
@@ -36,6 +37,7 @@ Note that this doesn't enable :attr:`Intents.members` since it's a privileged in
 Another example showing a bot that only deals with messages and guild information:
 
 .. code-block:: python3
+   :emphasize-lines: 7,9,10
 
     import discord
     intents = discord.Intents(messages=True, guilds=True)
@@ -155,6 +157,7 @@ Due to an :ref:`API change <intents_member_cache>` Discord is now forcing develo
 For example:
 
 .. code-block:: python3
+   :emphasize-lines: 3,6,8,9
 
     import discord
     intents = discord.Intents.default()