Conflicts:
	CMakeLists.txt
	Makefile
	build.yaml
	package.json
	src/core/lib/surface/version.c
	src/csharp/Grpc.Auth/project.json
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Core/project.json
	src/csharp/Grpc.HealthCheck/project.json
	src/csharp/build_packages.bat
	src/node/health_check/package.json
	src/node/tools/package.json
	src/python/grpcio/grpc_version.py
	src/python/grpcio_health_checking/grpc_version.py
	src/python/grpcio_tests/grpc_version.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal