added user interface in command line for demo
added user interface in command line for demo and resolved conflicts