parsing of cli done
fixed conflicts