other edit of cmd
fixed conflict