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