diff --git a/index.html b/index.html
index 50ff3ac..5a6f10a 100644
--- a/index.html
+++ b/index.html
@@ -11,11 +11,7 @@
 
 	<div style="font-family:sans-serif;font-size:12px;border:thin solid #bbb;padding:5px;position:absolute;top:10px;left:10px;z-index:10;background-color:rgba(255,255,255,0.8)">
 		<table id="params"></table>
-<<<<<<< HEAD
 		<div id="log" style="border:thin solid lightGrey;padding:10px"></div>
-=======
-		<!-- <div id="log" style="border:thin solid lightGrey;padding:10px"></div> -->
->>>>>>> origin/master
 		<button id="restart">Restart</button>
 	</div>