DOC: fix merge conflicts

Author: acrossler

pandas/core/groupby/generic.py

@@ -929,12 +929,14 @@ def describe(self, percentiles=None, include=None, exclude=None) -> Series:
             - 'all' : All columns of the input will be included in the output.
             - A list-like of dtypes : Limits the results to the
             provided data types.
+
             To limit the result to numeric types submit
             ``numpy.number``. To limit it instead to object columns submit
             the ``numpy.object`` data type. Strings
             can also be used in the style of
             ``select_dtypes`` (e.g. ``df.describe(include=['O'])``). To
             select pandas categorical columns, use ``'category'``
+
             - None (default) : The result will include all numeric columns.
             
         exclude : list-like of dtypes or None (default), optional,
@@ -1665,7 +1667,8 @@ def plot(self) -> GroupByPlot:
             - 'area' : area plot
             - 'pie' : pie plot
             - 'scatter' : scatter plot (DataFrame only)
-            - 'hexbin' : hexbin plot (DataFrame only)
+            - 'hexbin' : hexbin plot (DataFrame only).
+
         ax : matplotlib axes object, default None
             An axes of the current figure.
         subplots : bool or sequence of iterables, default False