diff --git a/explorer/htm/BeamExplorer.htm b/explorer/htm/BeamExplorer.htm
index 55e9ee881..be4ac9b6b 100644
--- a/explorer/htm/BeamExplorer.htm
+++ b/explorer/htm/BeamExplorer.htm
@@ -223,13 +223,8 @@
 		color: #2c2c2c;
 	}
 	.amount {
-<<<<<<< HEAD
-		font-family: monospace;
-		font-size: 1.7rem;
-=======
 		font-family: "Lucida Console", ui-monospace, monospace;
 		font-size: 1.4rem;
->>>>>>> master
 		color: darkcyan;
 	}
 	.amount.pos {
@@ -1520,11 +1515,7 @@ <h2>Deployed Smart Contracts</h2>\n\
         // s = Size Compressed
         // S = Size Archive
 		xmlhttp.onload = DisplayHdrs;
-<<<<<<< HEAD
-		xmlhttp.open("GET", urlPrefix +  "hdrs" + urlSuffix + "&nMax=100&cabs=&crel=dfkoOiIC");
-=======
 		xmlhttp.open("GET", urlPrefix +  "hdrs" + urlSuffix + "&cabs=&crel=dfkoOiIC" + "&nMax=" + nMax);
->>>>>>> master
 		xmlhttp.send();
 	}
 	else if (type == "contracts")