Tools for collaborative conflict resolution