next merge issue fix