fix error made in previous rebase merge conflict
Merge pull request #24 from Seattle-Attractions/fix_rebase_error

fix error made in previous rebase merge conflict