/auth_messages.cc                -diff merge=ours
/auth_messages.h                 -diff merge=ours
/http_messages.cc                -diff merge=ours
/http_messages.h                 -diff merge=ours
