need show
resolve conflict