Added HttpClient
Fixed conflicts