http request
merge conflicts resolved