build

Fix merge conflit #7

Job	Run time
Ubuntu x86 Debug (Non-Portable)	2m 11s
macOS x86_64 Debug (Non-Portable)	1m 27s
Ubuntu x86 Release (Non-Portable)	2m 53s
Ubuntu x86_64 Debug (Non-Portable)	1m 33s
Windows x86 Debug (Non-Portable)	3m 50s
macOS x86_64 Release (Non-Portable)	2m 10s
Ubuntu x86_64 Release (Non-Portable)	1m 50s
Windows x86 Release (Portable)	3m 57s
macOS arm64 Debug (Non-Portable)	1m 25s
Windows x86 Release (Non-Portable)	3m 58s
macOS arm64 Release (Non-Portable)	2m 13s
Windows x86_64 Debug (Non-Portable)	3m 39s
Windows x86_64 Release (Portable)	3m 58s
Windows x86_64 Release (Non-Portable)	3m 56s
create-latest	0s
create-release	0s
	39m 0s

Provide feedback