DOC fix merge conflict

Author: glemaitre

Diff for: doc/whats_new/v0.11.rst

@@ -67,10 +67,7 @@ Enhancements
 - :class:`~imblearn.over_sampling.SMOTENC` now support passing array-like of `str`
   when passing the `categorical_features` parameter.
   :pr:`1008` by :user`Guillaume Lemaitre <glemaitre>`.
-<<<<<<< HEAD
 
 - :class:`~imblearn.over_sampling.SMOTENC` now support automatic categorical inference
   when `categorical_features` is set to `"auto"`.
   :pr:`1009` by :user`Guillaume Lemaitre <glemaitre>`.
-=======
->>>>>>> origin/master