moved changelog entries after merge