fix conflicts with develop branch (#13532)
fix conflicts with develop branch (#13532)


Sing-Li/Rocket.Chat,subesokun/Rocket.Chat,4thParty/Rocket.Chat,inoio/Rocket.Chat,Sing-Li/Rocket.Chat,VoiSmart/Rocket.Chat,inoio/Rocket.Chat,VoiSmart/Rocket.Chat,4thParty/Rocket.Chat,VoiSmart/Rocket.Chat,4thParty/Rocket.Chat,inoio/Rocket.Chat,4thParty/Rocket.Chat,subesokun/Rocket.Chat,subesokun/Rocket.Chat,Sing-Li/Rocket.Chat,subesokun/Rocket.Chat,Sing-Li/Rocket.Chat