fixing tumblr post problem
merge conflicts