test conflict in master