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