Blockquote style
confrict fix