Revert "fixed conversations"

This reverts commit ec5591388527b79476fca1f251123b8eb3f0d4c2.
Revert "Revert "fixed conversations""

This reverts commit 3a0affdb72eb86fc4c85d74171d2c02621592b88.