create-cmd complete
resolved merge conflict from master
fixing merge conflict from master