Conflicts: build.gradle documentation/connections.html documentation/debugging.html documentation/extensions/filetransfer.html documentation/extensions/rosterexchange.html documentation/gettingstarted.html documentation/index.html documentation/legacy/messageevents.html smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java