The changes look good, but it looks like there are some conflicts that need to be resolved before we can merge. Also, I don't see components/benchmark folder added along the files, but I see components/subgoal files deleted. Should this all be deleted?

Yes @BeeSeeWhy, those files need to be replaced or references to them need to be removed, but the missing files are causing problems as there are still imports pointing to them.

The changes look good, but it looks like there are some conflicts that need to be resolved before we can merge. Also, I don't see components/benchmark folder added along the files, but I see components/subgoal files deleted. Should this all be deleted?

I believe this is good to go. There is src/components/benchmarks, let me know if there's anything else that you notice as being out of place or missing.

This should hopefully now be up to date and working in light off the most recent updates on main. @canjalal and @thomhickey, you may want to check specifically to make sure that the latest addSubgoal/addBenchmark tests haven't gotten mangled by the change in terms.

Comparing main vs this branch's behavior, there's something to note: when loading student pages that don't have benchmarks, there are 500 errors in the terminal, and the page is slow to load.

That being said, the code looked good prior to the behavior check, so I'm not sure what is causing this.

Thanks for the feedback, I'll take a look! I'm assuming this was after resetting the database? Were there any issues when doing so?

Comparing main vs this branch's behavior, there's something to note: when loading student pages that don't have benchmarks, there are 500 errors in the terminal, and the page is slow to load.
That being said, the code looked good prior to the behavior check, so I'm not sure what is causing this.

Thanks for the feedback, I'll take a look! I'm assuming this was after resetting the database? Were there any issues when doing so?

My mistake! I didn't reset the db. I'll update my review to approve. Sorry about that, Connor!

Updating to approve- no 500 errors after db reset.

Awesome, thank you, Katrina!