merge from new_xmpp