Using DISC to Resolve Conflict