Make sure we didn't commit conflicts

What does this MR do?

Make sure we didn't commit conflicts

Are there points in the code the reviewer needs to double check?

• Consensus that we want this
• Update build image to install ripgrep gitlab-build-images!48 (closed)
• Update image in .gitlab-ci.yml to use the new one
• Remove demo conflicts in CHANGELOG.md

What are the relevant issue numbers?

Closes #35627 (closed)