removed resolvers - not intended for urlresolver
resolved conflicts