odd merge issue