Merging changes to command line code