merge in more changelog entries