fixing cli merge issue