build

changelog: fix conflict resolution error in 95344f9e #14791

Job	Run time
Check protos	48s
Build jj-lib without Git support	46s
build (ubuntu-latest)	4m 23s
cargo-deny (advisories)	23s
build (macos-13)	10m 7s
cargo-deny (bans licenses sources)	21s
Clippy check	2m 27s
Check that MkDocs can build the docs	19s
build (macos-14)	3m 19s
build (windows-latest)	9m 38s
Check that MkDocs can build the docs with Poetry 1.8	20s
Check formatting	15s
build (ubuntu-latest, --all-features)	5m 25s
	38m 31s

Provide feedback