Fix merge conflict in changelog.adoc

[FarzadHayat]

Ticket: DOC-2446

Site: Staging branch

Need PR to fix merge conflict as release/7.2 is a protected branch.

Changes:

• Fix merge conflict in changelog.adoc

Pre-checks:

• [x] Branch prefixed with feature/<version>/, hotfix/<version>/, staging/<version>/, or release/<version>/
• [x] modules/ROOT/nav.adoc has been updated (if applicable)
• [x] Files has been included where required (if applicable)
• [x] Files removed have been deleted, not just excluded from the build (if applicable)
• [x] Files added for New product features, and included a release note entry.

Review:

• [x] Documentation Team Lead has reviewed