html5 spec merged