# Concatenate changes in CHANGELOG.md to avoid merge conflicts
CHANGELOG.md merge=union
