tweaking the http piece
fixes merge conflict