Fixed odd merge issue