Fix ul, ol styles
Fix merge conflict