add conflict
resolve conflict