Added conflict resolution UI