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