Change https for http
Merge conflict