PIM-3221 : fix changelog merging issue