updating to use url
resolve conflict