Fix merge conflict in CHANGELOG

# Conflicts:
#   CHANGELOG.md
3 jobs for bookmarkButton in 8 minutes and 42 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Lint
passed #192373
lint

00:02:24

 
  Build
passed #192374
build

00:02:58

 
  Test
passed #192375
test

00:03:18