Fixing a merge problem: restoring cli-parser-1.1.1