“Reports a temporary de-escalation and partial agreement, but explicitly notes the dispute is ongoing and unresolved.”