CLI Tweaks
Merging