test conflict on current branch