diff --git a/freqtrade/optimize/hyperopt_loss_sortino_daily.py b/freqtrade/optimize/hyperopt_loss_sortino_daily.py
index 43c347375..0739379f6 100644
--- a/freqtrade/optimize/hyperopt_loss_sortino_daily.py
+++ b/freqtrade/optimize/hyperopt_loss_sortino_daily.py
@@ -50,11 +50,7 @@ class SortinoHyperOptLossDaily(IHyperOptLoss):
         expected_returns_mean = total_profit.mean()
 
         results['downside_returns'] = 0
-<<<<<<< HEAD
         results.loc[total_profit < 0, 'downside_returns'] = results['profit_percent_after_slippage']
-=======
-        results.loc[total_profit < 0, 'downside_returns'] = results['profit_percent']
->>>>>>> 0e8c569baadc9aefb80aab573def124666fb39ea
         down_stdev = results['downside_returns'].std()
 
         if (down_stdev != 0.):