Merge branch 'main' into comp-bot

diff --cc .github/CODEOWNERS
index fb3dc6dba4fe5dedf5543d2da731f78c174d4705,f7e43b84089b390140de6b912d88702be82e7804..1fbdede686494d3b60251081a2027d2c0ec29288
--- 1/.github/CODEOWNERS
--- 2/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@@ -1,2 -1,2 +1,2 @@@
  # Make the pull reviewers code owners for every file, they will get requested for review when a PR is made
- *   @MaxwellTTan20 @Arnav814 @moogoesmeow0 @Wesley28W
 -*   @Saara21 @MaxwellTTan20 @Arnav814 @moogoesmeow0 @iefmoit @Wesley28W
++*   @MaxwellTTan20 @Arnav814 @moogoesmeow0 @iefmoit @Wesley28W