merge issue solved