/class_cmds_messages.cc          -diff merge=ours
/class_cmds_messages.h           -diff merge=ours
