for conflict
resolve conflict