Identifying and Addressing Conflict