Conflict and Resolution Analysis