change url to use https instead of http
resolve conflicts