correct conflict
resolve conflict resolution