matrix-react-sdk

d6cf2346 - Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240