fix: used merge-upstream to sync fork & upstream

[asheerrizvi]

Summary

Fixes #6116

Checklist

Please add a x inside each checkbox:

• [x] I have read the contribution guidelines.
• [x] Code is formatted via running yarn format.
• [x] Tests are passing via running yarn test.
• [ ] The status checks are successful (continuous integration). Those can be seen below.

🐢