update merge issue