Fix merge conflicts #20631

Job	Run time
build-sway-lib-std	1m 20s
get-fuel-core-version	46s
build-sway-lib-core	1m 2s
build-forc-doc-sway-lib-std	2m 19s
build-mdbook	6m 5s
build-reference-examples	1m 23s
build-forc-test-project	5m 43s
build-sway-examples	1m 34s
cargo-clippy	1m 7s
cargo-build-workspace	4m 4s
cargo-fmt-check	12s
cargo-run-e2e-test-evm	2m 38s
cargo-run-e2e-test-midenvm	2m 41s
cargo-test-lib-std	3m 26s
cargo-toml-fmt-check	17s
cargo-test-workspace	5m 14s
cargo-test-sway-lsp	5m 51s
cargo-unused-deps-check	4m 24s
forc-fmt-check-panic	2m 17s
check-sdk-harness-test-suite-compatibility	42s
forc-fmt-check-sway-examples	58s
forc-fmt-check-sway-lib-core	1m 8s
forc-fmt-check-sway-lib-std	58s
forc-pkg-fuels-deps-check	24s
forc-run-benchmarks	4m 8s
forc-unit-tests	2m 21s
pre-publish-check	0s
cargo-test-forc-debug	4m 23s
cargo-run-e2e-test-release	13m 56s
cargo-test-forc-client	5m 1s
cargo-run-e2e-test	13m 1s
notify-slack-on-failure	1s
publish	0s
build-publish-master-image	0s
build-publish-release-image	0s
Build and upload forc binaries to release	0s
	1h 39m 24s

Provide feedback