Fix software blob analysis bug related to merges.
Merge branch 'master' of github.com:alexlee-gk/cs150