resolve conflict
resolve