Fix changelog.txt merge