add styles that got lost in merge conflict