Clean up 'HTML5's
Resolve conflicts