fix merge conflicts #77

Job	Run time
Select platforms	1s
linux-x86 / build (debug)	46s
linux-x64 / build (debug)	45s
linux-x86 / build (release)	46s
linux-x64 / build (release)	44s
linux-x64-hs-nopch / build (debug)	46s
linux-x64-hs-minimal / build (debug)	45s
linux-x64-hs-optimized / build (debug)	45s
linux-x64-hs-zero / build (debug)	44s
macos-aarch64 / build (debug)	1m 0s
macos-aarch64 / build (release)	1m 0s
macos-x64 / build (debug)	1m 0s
windows-aarch64 / build (debug)	1m 53s
macos-x64 / build (release)	1m 2s
windows-aarch64 / build (release)	2m 1s
windows-x64 / build (debug)	2m 5s
windows-x64 / build (release)	2m 7s
linux-x64	0s
linux-cross-compile	0s
linux-x86	0s
macos-x64	0s
windows-x64	0s
Remove bundle artifacts	2s
	18m 12s

Provide feedback