test conflict after merging;