todos++
oops, fix broken logic in protobuf merge