diff --git a/log-analysis/DeepRacer Log Analysis.ipynb b/log-analysis/DeepRacer Log Analysis.ipynb
index f000d8396..c678f9fdf 100644
--- a/log-analysis/DeepRacer Log Analysis.ipynb	
+++ b/log-analysis/DeepRacer Log Analysis.ipynb	
@@ -515,13 +515,9 @@
     }
    ],
    "source": [
-<<<<<<< HEAD
-    "df = convert_to_pandas(data)\n",
-=======
     "EPISODES_PER_ITERATION = 20\n",
     "\n",
     "df = convert_to_pandas(data, EPISODES_PER_ITERATION)\n",
->>>>>>> 213de10ad9892624483dddf166434beb08f0d3df
     "df.head()"
    ]
   },