test conflict
resolve conflict and merge