update css and markup
merge conflict