added test conflict