automerge: 736cb49 * commit '736cb492aea736e9c3b33fe20285f531497462d0': Fixing conference merge where only one party is added to conference.
automerge: 736cb49 * commit '736cb492aea736e9c3b33fe20285f531497462d0': Fixing conference merge where only one party is added to conference.