un-did googl shortening for facebook
fixed merge conflict