post merge fixes

Author: WillAyd

doc/source/whatsnew/v1.0.0.rst

@@ -324,7 +324,7 @@ Note that errors will now be raised when conflicting or potentially ambiguous ar
    Out[1]:
       0
    1  1
-   
+
    In [2]: df.rename(mapper={0: 1}, index={0: 2})
    Out[2]:
       0
@@ -351,7 +351,7 @@ keywords.
 .. ipython:: python
 
    df.rename(index={0: 1}, columns={0: 2})
-   
+
 Extended verbose info output for :class:`~pandas.DataFrame`
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -586,8 +586,6 @@ Optional libraries below the lowest tested version may still work, but are not c
 
 See :ref:`install.dependencies` and :ref:`install.optional_dependencies` for more.
 
->>>>>>> upstream/master
-
 .. _whatsnew_1000.api.other:
 
 Other API changes

pandas/core/frame.py

@@ -15,7 +15,6 @@
 import sys
 from textwrap import dedent
 from typing import (
-    Callable,
     Callable,
     IO,
     TYPE_CHECKING,