fix merge conflict

Author: Erotemic

doc/source/whatsnew/v1.5.0.rst

@@ -819,7 +819,7 @@ I/O
 - Bug in :func:`read_excel` when reading a ``.ods`` file with newlines between xml elements (:issue:`45598`)
 - Bug in :func:`read_parquet` when ``engine="fastparquet"`` where the file was not closed on error (:issue:`46555`)
 - :meth:`to_html` now excludes the ``border`` attribute from ``<table>`` elements when ``border`` keyword is set to ``False``.
--
+- Bug in :func:`read_json` reading ``NaN`` values in corner cases (:issue:`46627`)
 
 Period
 ^^^^^^