test conflict resolve