Resolution and Conflict Resolution