feature: built-in merge conflict solver (#2070) #4291

Job	Run time
Prepare version string	5s
Build / Build macOS (Apple Silicon)	2m 10s
Build / Build Windows ARM64	4m 7s
Build / Build Windows x64	3m 18s
Build / Build macOS (Intel)	4m 12s
Build / Build Linux (arm64)	4m 7s
Build / Build Linux	3m 7s
Package / Package Linux (linux-arm64)	58s
Package / Package macOS (osx-arm64)	18s
Package / Package macOS (osx-x64)	16s
Package / Package Linux (linux-x64)	55s
Package / Package Windows (win-arm64)	29s
Package / Package Windows (win-x64)	29s
	24m 31s

Provide feedback