diff --git a/expert.html b/expert.html
index 71f863c..ff754df 100644
--- a/expert.html
+++ b/expert.html
@@ -1,6 +1,6 @@
-<html>
+<!DOCTYPE html>
+
 <head>
-<<<<<<< HEAD:expert.html
 <title>Visual 6502 in JavaScript</title>
 <style type="text/css">
 /*
@@ -366,16 +366,5 @@ click here and type if your program handles input
    </div>
 </div> <!-- closing rightcolumn -->
 </div> <!-- closing 'frame' div -->
-=======
-</head>
-<body>
-Ed's github page for visual6502 project - if this is empty, there's no
-preview from Ed. Refer instead to the upstream preview at
-<a href="http://trebonian.github.com/visual6502">http://trebonian.github.com/visual6502</a>
-or the staging version of the live site at
-<a href="http://visual6502.org/stage/JSSim">http://visual6502.org/stage/JSSim</a>
-or, of course, the live site itself at
-<a href="http://visual6502.org/JSSim">http://visual6502.org/JSSim</a>
->>>>>>> 8f2e296ef69e46c27a602063b3a342ee30e8abee:expert.html
 </body>
 </html>
