whatsnew merging

Author: cmazzullo

doc/source/whatsnew/v0.21.0.txt

@@ -1068,6 +1068,7 @@ Indexing
 - 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`)
 =======
@@ -1077,6 +1078,10 @@ Indexing
 - 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