move conflict resolution into the message (this is a workaround because we do not show primary actions when tabs are enabled)

Instead of just letting the API layer know about content provider we must push it lower because only than we can handle uri's opaque.

# Conflicts:
#	src/vs/languages/html/common/htmlTags.ts