Built-in merge conflict solver #4289

Job	Run time
Build / Build Linux (arm64)	5s
Build / Build Linux	5s
Build / Build Windows x64	3s
Build / Build macOS (Intel)	5s
Build / Build Windows ARM64	6s
Prepare version string	5s
Build / Build macOS (Apple Silicon)	5s
Package	0s
Prepare version string	5s
Build / Build Linux	2m 59s
Build / Build Windows x64	3m 26s
Build / Build Windows ARM64	3m 27s
Build / Build macOS (Apple Silicon)	3m 22s
Build / Build macOS (Intel)	4m 41s
Build / Build Linux (arm64)	2m 53s
Package / Package macOS (osx-x64)	20s
Package / Package macOS (osx-arm64)	21s
Package / Package Linux (linux-x64)	1m 2s
Package / Package Linux (linux-arm64)	53s
Package / Package Windows (win-x64)	25s
Package / Package Windows (win-arm64)	44s
	25m 12s

Provide feedback