Update manifest.xml

Added conflicting plugin.
Merge pull request #1 from gerard-kanters/patch-1

Update manifest.xml