Remove relundant lines in whatsnew

Author: makbigc

doc/source/whatsnew/v0.25.0.rst

@@ -253,10 +253,6 @@ Performance Improvements
 - Improved performance of :meth:`Series.map` for dictionary mappers on categorical series by mapping the categories instead of mapping all values (:issue:`23785`)
 - Improved performance of :meth:`IntervalIndex.intersection` (:issue:`24813`)
 
-<<<<<<< HEAD
-
-=======
->>>>>>> Remove duplicate line in whatsnew note
 .. _whatsnew_0250.bug_fixes:
 
 Bug Fixes