add support for different sources, using URL path
resolve conflicts