fix CommandType merge error