Getting Upstream of Conflict