Changing blockquote styles
design changes blog
resolving merge conflict