test conflict
resolve conflict