dictionary definitions for "conflict resolution"