working http request
Fixed merge conflicts