fix(changelog): remove stray conflict marker landed by #382 squash#383

BartWaardenburg merged 1 commit into

mainfallow-rs/fallow:mainfrom

fix/changelog-stray-conflict-markerfallow-rs/fallow:fix/changelog-stray-conflict-markerCopy head branch name to clipboard