Conflict and Resolutions