Title: From Conflict Resolution to Pe