merge of cli and icli