Replace myspace with tumblr
resolve conflict