Update addon.xml

Eliminate merge conflict