Minor changes to CommandLine
Resolving Conflicts