Fix merge conflict in CHANGELOG

What does this MR do?

Removes the >>>>> master from the CHANGELOG that was accidentally left after a merge conflict.

What are the relevant issue numbers?

n/a