automatically handle merge conflicts for changelog files with union

automatically handle merge conflicts for changelog files with union #2070