adding provider URL
resolving conflicts