fix merge conflict
Merge pull request #33 from ahardy55/master

fix merge conflict