blog updates
merge conflicts