jabber
resolve merge