Fix dangling merge conflict

Looks like a merge conflict was left in the plugin.xml and was committed.