We use scriv[1] to manage our changelog. Each branch gets its own fragment, on release all fragments belonging to branches that have been merged get collected into a single entry and those fragments are deleted. No muss, no fuss, no merge conflicts.
[1] https://scriv.readthedocs.io/en/1.1.0/
