wordpress and tumblr fix
conflicts