Today
codegen + protobufs after merge conflict resolution