Added command line options
Resolved conflicts