purchase improvement
resolve conflict