fixed merge errors
Merge pull request #15 from elijahkim/fix_brokenness

fixed merge errors