Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com>

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

Co-authored-by: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>

Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Co-authored-by: Debdut Chakraborty <debdut.chakraborty@rocket.chat>
Co-authored-by: Hugo Costa <hugocarreiracosta@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>

Co-authored-by: Diego Sampaio <chinello@gmail.com>

Co-authored-by: Diego Sampaio <chinello@gmail.com>

* Merge OAuth users with existing users from distinct services when setting is enabled

* Add changesets

* Fix changesets

* Apply requested changes

---------

Co-authored-by: Diego Sampaio <chinello@gmail.com>
Co-authored-by: Rafael Tapia <rafael.tapia@rocket.chat>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Gabriel Casals <83978645+casalsgh@users.noreply.github.com>

Co-authored-by: Martin Schoeler <20868078+MartinSchoeler@users.noreply.github.com>