diff --git a/freqtrade/enums/liqformula.py b/freqtrade/enums/liqformula.py
index 712c6d7fe..158e5f9b3 100644
--- a/freqtrade/enums/liqformula.py
+++ b/freqtrade/enums/liqformula.py
@@ -4,14 +4,6 @@ from freqtrade.enums.tradingmode import TradingMode
 from freqtrade.enums.collateral import Collateral
 from enum import Enum
 
-<< << << < HEAD
-== == == =
->>>>>> > eab5bb8a(integrated liqformula into persistence/models, addjusted calc_close_value to change based on trading mode)
-
-
-# from math import ceil
-
-
 # from math import ceil