Ch 7-Conflict Resolution