merge
CLI update