Add missing style elements
Fix merge conflict