Conflicts: sflphone-common/src/audio/mainbuffer.cpp sflphone-common/src/conference.cpp sflphone-common/src/managerimpl.cpp sflphone-common/src/sip/sipvoiplink.cpp