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