Effective collaborative conflict resolution