fix merge conflict
Merge pull request #5 from hwray/fix-merge-conflict

fix merge conflict