app change
resolve conflict