blog styles
merge conflicts