add a touch of html
add a touch of style
merge conflicts