# oxygen#145: two changes that each add a changelog entry in the same
# place keep both, without a conflict.
CHANGELOG.md merge=union