might roll this back
fix merge conflict
fix merge
resolve problems i hope
actually fixed
Merge pull request #24 from jusjmkim/merge-conflict-resolution

Merge conflict resolution