minor edit to gauss model, sha (need to fix this...)
sha conflict
resolving conflict
another sha conflict