the changelog should just collect all added lines, no conflict resolution
necessary