resolved some conflicts, added CommandLine