fix conflicts #66

Job	Run time
cargo build (windows-2022, stable)	3m 20s
cargo clippy (windows-2022, stable)	2m 39s
cargo clippy (windows-2022, nightly)	3m 45s
cargo build (windows-2022, nightly)	5m 43s
cargo clippy (macos-latest, stable)	1m 5s
cargo build (macos-latest, stable)	2m 0s
cargo test (windows-2022, stable)	7m 42s
cargo fmt (windows-2022, stable)	42s
cargo clippy (macos-latest, nightly)	1m 52s
cargo build (macos-latest, nightly)	2m 10s
cargo test (windows-2022, nightly)	6m 52s
cargo fmt (windows-2022, nightly)	27s
cargo clippy (ubuntu-22.04, stable)	1m 13s
cargo build (ubuntu-22.04, stable)	1m 35s
cargo test (macos-latest, stable)	2m 15s
cargo clippy (ubuntu-22.04, nightly)	1m 26s
cargo build (ubuntu-22.04, nightly)	2m 49s
cargo fmt (macos-latest, stable)	7s
cargo test (macos-latest, nightly)	3m 23s
cargo fmt (macos-latest, nightly)	13s
cargo test (ubuntu-22.04, stable)	3m 30s
cargo fmt (ubuntu-22.04, stable)	4s
cargo test (ubuntu-22.04, nightly)	2m 57s
cargo fmt (ubuntu-22.04, nightly)	13s
Upload Test Event	0s
	58m 2s

Provide feedback