mixed merge issue