matrix-react-sdk

5d0d81e7 - not sure how I butchered this merge conflict resolution this much.