fixed merge issues

Author: rohanp

doc/source/whatsnew/v0.21.0.txt

@@ -298,13 +298,9 @@ Performance Improvements
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 - Improved performance of instantiating :class:`SparseDataFrame` (:issue:`16773`)
-<<<<<<< HEAD
 - Improved performance of  :func:`median()` when bottleneck is not installed but :func:`np.namnmedian` is present (:issue:`16468`)
 - :attr:`Series.dt` no longer performs frequency inference, yielding a large speedup when accessing the attribute (:issue:`17210`)
-=======
-- :attr:`Series.dt` no longer performs frequency inference, yielding a large speedup when accessing the attribute (:issue:`17210`)
 
->>>>>>> 34c4ffd7c454848311f71e6869b5cad4bc132449
 
 .. _whatsnew_0210.bug_fixes:
 

pandas/core/nanops.py

@@ -494,7 +494,6 @@ def reduction(values, axis=None, skipna=True):
 nanmax = _nanminmax('max', fill_value_typ='-inf')
 
 
-
 @disallow('O')
 def nanargmax(values, axis=None, skipna=True):
     """
@@ -506,7 +505,6 @@ def nanargmax(values, axis=None, skipna=True):
     return result
 
 
-
 @disallow('O')
 def nanargmin(values, axis=None, skipna=True):
     """