diff --git a/pandas_ta/core.py b/pandas_ta/core.py
index 154fa6b..7ff65e8 100644
--- a/pandas_ta/core.py
+++ b/pandas_ta/core.py
@@ -1105,13 +1105,7 @@ class AnalysisIndicators(BasePandasObject):
         close = self._get_column(close, 'close')
         volume = self._get_column(volume, 'volume')
         from pandas_ta.volume.vp import vp
-<<<<<<< HEAD
         return vp(close=close, volume=volume, width=width, percent=percent, **kwargs)
-=======
-        result = vp(close=close, volume=volume, width=width, percent=percent, **kwargs)
-        self._add_prefix_suffix(result, **kwargs)
-        self._append(result, **kwargs)
-        return result
 
 
 
@@ -1122,5 +1116,4 @@ class AnalysisIndicators(BasePandasObject):
         result = rsi_event(close=close, above_val=above_val, below_val=below_val, length=length, drift=drift, offset=offset, **kwargs)
         self._add_prefix_suffix(result, **kwargs)
         self._append(result, **kwargs)
-        return result
->>>>>>> cbba026... Add RSI event
+        return result
\ No newline at end of file