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