Re: What changelog to preserve at untrivial merging?