Addressing conflict resolution in your user interface