How do people avoid a git merge nightmare when maintaining a CHANGELOG on an active project with multiple people / active PRs?