add changelog entries for merge