new conflict resolution interface now functional