fix: resolve remaining merge conflict markers #2

Job	Run time
Detect changed areas	8s
cargo shear	38s
Tests — windows-latest - x86_64-pc-windows-msvc	6m 21s
Format / etc	17s
Tests — windows-11-arm - aarch64-pc-windows-msvc	6m 3s
Tests — ubuntu-24.04-arm - aarch64-unknown-linux-gnu	3m 49s
Tests — ubuntu-24.04 - x86_64-unknown-linux-gnu	6m 1s
Lint/Build — macos-14 - aarch64-apple-darwin	3m 14s
Tests — macos-14 - aarch64-apple-darwin	5m 6s
Lint/Build — ubuntu-24.04 - x86_64-unknown-linux-musl	3m 7s
Lint/Build — ubuntu-24.04-arm - aarch64-unknown-linux-musl	2m 32s
Lint/Build — windows-11-arm - aarch64-pc-windows-msvc	4m 43s
Lint/Build — ubuntu-24.04 - x86_64-unknown-linux-gnu	2m 18s
Lint/Build — macos-14 - x86_64-apple-darwin	3m 46s
Lint/Build — ubuntu-24.04 - x86_64-unknown-linux-musl (release)	8m 14s
Lint/Build — ubuntu-24.04-arm - aarch64-unknown-linux-gnu	1m 56s
Lint/Build — windows-latest - x86_64-pc-windows-msvc	5m 7s
Lint/Build — windows-latest - x86_64-pc-windows-msvc (release)	8m 8s
Lint/Build — windows-11-arm - aarch64-pc-windows-msvc (release)	7m 7s
Lint/Build — macos-14 - aarch64-apple-darwin (release)	10m 17s
CI results (required)	4s
	1h 28m 56s

Provide feedback