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