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