Using mock of computePlugin in xmpp tests
Resolving conflicts