test conflict merge