Fix Linux XDP Merge Conflicts Properly #2386

Job	Run time
Ubuntu (linux, ubuntu-20.04, x64, openssl) / Build	3m 11s
Ubuntu (linux, ubuntu-22.04, x64, openssl3, -UseXdp) / Build	2m 55s
Windows (windows, windows-2022, x64, openssl3) / Build	5m 33s
Windows (windows, windows-2022, x64, openssl) / Build	4m 33s
Build All Darwin Frameworks / Build Darwin Binaries (ios, arm64) / Build	4m 1s
Build All Darwin Frameworks / Build Darwin Binaries (ios, x64) / Build	2m 22s
Build All Darwin Frameworks / Build Darwin Binaries (macos, arm64) / Build	4m 17s
Build All Darwin Frameworks / Build Darwin Binaries (macos, x64) / Build	3m 19s
Build All Darwin Frameworks / Build Universal Binaries	25s
Build All Darwin Frameworks / Build Darwin Framework (ios, x64)	15s
Build All Darwin Frameworks / Build Darwin Framework (ios, arm64)	28s
Build All Darwin Frameworks / Build Darwin Framework (macos, universal)	22s
Build All Darwin Frameworks / Build Darwin XCFramework	45s
DotNet Test (windows, windows-2022, x64, openssl)	1m 8s
DotNet Test (windows, windows-2022, x64, openssl3)	2m 4s
DotNet Test (linux, ubuntu-20.04, x64, openssl)	1m 7s
DotNet Test (linux, ubuntu-22.04, x64, openssl3, -UseXdp)	3m 35s
DotNet Test (macos, macos-12, universal, openssl)	27s
	40m 47s

Provide feedback