move whatsnew to 0.22.0

doc/source/whatsnew/v0.21.0.txt

@@ -1067,23 +1067,8 @@ Indexing
 - Bug in intersection of ``RangeIndex`` with negative step (:issue:`17296`)
 - Bug in ``IntervalIndex`` where performing a scalar lookup fails for included right endpoints of non-overlapping monotonic decreasing indexes (:issue:`16417`, :issue:`17271`)
 - Bug in :meth:`DataFrame.first_valid_index` and :meth:`DataFrame.last_valid_index` when no valid entry (:issue:`17400`)
-<<<<<<< HEAD
-<<<<<<< HEAD
 - Bug in :func:`Series.rename` when called with a callable, incorrectly alters the name of the ``Series``, rather than the name of the ``Index``. (:issue:`17407`)
 - Bug in :func:`String.str_get` raises ``IndexError`` instead of inserting NaNs when using a negative index. (:issue:`17704`)
-=======
-- Bug in :func:`Series.rename` when called with a `callable`, incorrectly alters the name of the `Series`, rather than the name of the `Index`. (:issue:`17407`)
-- Bug in :func:`String.str_get` raises `index out of range` error instead of inserting NaNs when using a negative index. (:issue:`17704`)
-<<<<<<< HEAD
-- When created with duplicate labels, ``MultiIndex`` now raises a `ValueError`. (:issue:`17464`)
->>>>>>> 4eff2d5... whatsnew entry
-=======
-=======
-- Bug in :func:`Series.rename` when called with a callable, incorrectly alters the name of the ``Series``, rather than the name of the ``Index``. (:issue:`17407`)
-- Bug in :func:`String.str_get` raises ``IndexError`` instead of inserting NaNs when using a negative index. (:issue:`17704`)
->>>>>>> f74a4ab... whatsnew merging
-- When created with duplicate labels, ``MultiIndex`` now raises a ``ValueError``. (:issue:`17464`)
->>>>>>> 868ec45... Whatsnew backticks
 
 I/O
 ^^^
@@ -1187,3 +1172,4 @@ Other
 ^^^^^
 - Bug where some inplace operators were not being wrapped and produced a copy when invoked (:issue:`12962`)
 - Bug in :func:`eval` where the ``inplace`` parameter was being incorrectly handled (:issue:`16732`)
+