I don't know why it still keeps saying i have merge problems
Merge branch 'code' of github.com:kyzhai/SMURF into code
did more main tests
Merge branch 'code' of github.com:kyzhai/SMURF into code
Revert "Fixed some of my tests' gold standards"

This reverts commit 72796b512f4240aef8fb887e2f5fa458bf058936.
Merge branch 'code' of github.com:kyzhai/SMURF into code