rebase cleanup

Author: bobhaffner

doc/source/whatsnew/v0.21.1.txt

@@ -103,11 +103,7 @@ Groupby/Resample/Rolling
 - Bug in ``DataFrame.resample(...).apply(...)`` when there is a callable that returns different columns (:issue:`15169`)
 - Bug in ``DataFrame.resample(...)`` when there is a time change (DST) and resampling frequecy is 12h or higher (:issue:`15549`)
 - Bug in ``pd.DataFrameGroupBy.count()`` when counting over a datetimelike column (:issue:`13393`)
-<<<<<<< HEAD
 - Bug in ``rolling.var`` where calculation is inaccurate with a zero-valued array (:issue:`18430`)
-=======
-- Bug when grouping by a single column and aggregating with a class like`list` or `tuple` (:issue:`18079`)
->>>>>>> added whatsnew
 -
 -
 
@@ -151,4 +147,4 @@ Other
 ^^^^^
 
 -
--
+-

doc/source/whatsnew/v0.22.0.txt

@@ -168,7 +168,7 @@ Plotting
 Groupby/Resample/Rolling
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
--
+- Bug when grouping by a single column and aggregating with a class like ``list`` or ``tuple`` (:issue:`18079`)
 -
 -