party and extended party
resolve conflict