fix conflicts

Conflicts:
	addon.xml
	changelog.txt