Case/switch change to if in Command.java
Merge