yet another reset
I know it's after code freeze but I didn't add any new code. I had to reset my code and add in old code that worked previously due to me not pushing up in the correct branch
fixed merge conflicts, finally sending up
fixed more merge conflicts