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