diff --git a/scripts/plot_dataframe.py b/scripts/plot_dataframe.py
index 5e533a030..6d14fb596 100755
--- a/scripts/plot_dataframe.py
+++ b/scripts/plot_dataframe.py
@@ -26,12 +26,7 @@ from freqtrade.analyze import Analyze
 from freqtrade import exchange
 import freqtrade.optimize as optimize
 
-
-<<<<<<< HEAD
-logger = logging.getLogger('freqtrade')
-=======
 logger = logging.getLogger(__name__)
->>>>>>> bddf009a2b6d0e1a19cca558887ce972e99a6238
 
 
 def plot_analyzed_dataframe(args: Namespace) -> None:
diff --git a/scripts/plot_profit.py b/scripts/plot_profit.py
index c1e1d068f..daa16ddc9 100755
--- a/scripts/plot_profit.py
+++ b/scripts/plot_profit.py
@@ -24,8 +24,7 @@ import plotly.graph_objs as go
 from freqtrade.arguments import Arguments
 from freqtrade.configuration import Configuration
 from freqtrade.analyze import Analyze
-from freqtradeimport constants
-
+from freqtrade import constants
 
 import freqtrade.optimize as optimize
 import freqtrade.misc as misc
@@ -33,11 +32,12 @@ import freqtrade.misc as misc
 
 logger = logging.getLogger(__name__)
 
+
 # data:: [ pair,      profit-%,  enter,         exit,        time, duration]
 # data:: ["ETH/BTC", 0.0023975, "1515598200", "1515602100", "2018-01-10 07:30:00+00:00", 65]
-def make_profit_array(
-        data: List, px: int, min_date: int,
-        interval: int, filter_pairs: Optional[List] = None) -> np.ndarray:
+def make_profit_array(data: List, px: int, min_date: int,
+                      interval: int,
+                      filter_pairs: Optional[List] = None) -> np.ndarray:
     pg = np.zeros(px)
     filter_pairs = filter_pairs or []
     # Go through the trades