# oxygen#145: two changes adding changelog entries keep both. CHANGELOG.md merge=union