Fix merge issue closes pandas-dev#37705

Author: inspurwusixuan

doc/source/whatsnew/v1.2.0.rst

@@ -507,11 +507,7 @@ I/O
 - Bug in :class:`HDFStore` was dropping timezone information when exporting :class:`Series` with ``datetime64[ns, tz]`` dtypes with a fixed HDF5 store (:issue:`20594`)
 - :func:`read_csv` was closing user-provided binary file handles when ``engine="c"`` and an ``encoding`` was requested (:issue:`36980`)
 - Bug in :meth:`DataFrame.to_hdf` was not dropping missing rows with ``dropna=True`` (:issue:`35719`)
-<<<<<<< HEAD
-- Bug in :func:`read_html` was raising a ``TypeError`` when supplying a ``pathlib.Path`` argument to the ``io`` parameter  (:issue:`37705`)
-=======
 - Bug in :func:`read_html` was raising a ``TypeError`` when supplying a ``pathlib.Path`` argument to the ``io`` parameter (:issue:`37705`)
->>>>>>> 88bc2ee492633ab6a94be78384c5ac7524043322
 
 Plotting
 ^^^^^^^^