Building a Foundation for Conflict Resolution