add ability to query conflicts from the migrate provider
add ui support for resolving conflicts