Update changelog.txt

Fix conflict