to test conflict resolve