merge issue fix