Repairing merge errors in HTML

leaning up minor merge errors in HTML.