CLN: fix conflict leftovers

Author: jorisvandenbossche

doc/source/whatsnew/v0.15.1.txt

@@ -293,15 +293,10 @@ Bug Fixes
 
 
 
-<<<<<<< HEAD
 - Fixed a bug where plotting a column ``y`` and specifying a label would mutate the index name of the original DataFrame (:issue:`8494`)
+- Fix regression in plotting of a DatetimeIndex directly with matplotlib (:issue:`8614`).
 
 - Bug in ``date_range`` where partially-specified dates would incorporate current date (:issue:`6961`)
 
 - Bug in Setting by indexer to a scalar value with a mixed-dtype `Panel4d` was failing (:issue:`8702`)
-=======
-- Fixed a bug where plotting a column ``y`` and specifying a label
-would mutate the index name of the DataFrame ``y`` came from (:issue:`8494`)
 
-- Fix regression in plotting of a DatetimeIndex directly with matplotlib (:issue:`8614`).
->>>>>>> VIS: register datetime64 in matplotlib units registry (GH8614)