resolve merge conflict

Author: mbykhovtsev-ms

SPECS/protobuf/protobuf.spec

@@ -1,14 +1,15 @@
 Summary:        Google's data interchange format
 Name:           protobuf
 Version:        3.17.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Development/Libraries
 URL:            https://developers.google.com/protocol-buffers/
 Source0:        https://github.com/protocolbuffers/protobuf/releases/download/v%{version}/%{name}-all-%{version}.tar.gz
 Patch0:         CVE-2022-1941.patch
+Patch1:         CVE-2025-4565.patch
 BuildRequires:  curl
 BuildRequires:  libstdc++
 BuildRequires:  make