Update HTML
merge conflict