Fix changelog merge conflict

# Conflicts:
#   CHANGELOG.md
3 jobs for showMobileNewPost in 8 minutes and 52 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Lint
passed #192367
lint

00:02:24

 
  Build
passed #192368
build

00:03:03

 
  Test
passed #192369
test

00:03:24