[Merge this first] Fixing Merge Issues

I reset main back to it's original state before anything was merged or reverted when there was no conflicts using the following statement:

git reset --hard de35c2afaad9c3ad73124bcf0666b149f4923d25

This is the commit that the branch was reset to

This should hopefully make it so that all existing merge request will no longer have merge conflicts and can be merged.