Update `cli` to use the new `MergeConfigMixIn`.

The purpose of the above MixIn is to override the options on the configuration file with the options passed from the console.