Investigate behaviour of gitattributes without satellites

Check if CHANGELOG merge=union from .gitattributes. works in master or ignored and what we can do to make it work.