[NEW] resolve merge share function

[karlprieb]

@RocketChat/core

Closes #4033

This PR is only a merge conflict resolve for #4033

[CLAassistant]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ karlprieb
❌ tgxn
_{You have signed the CLA already but the status is still pending? Let us recheck it.}