CHANGELOG.md merge=union * text=auto *.png binary