tumblr stuff
fixed conflicts