small change
add conflict
Merge pull request #3 from k-eaton/small-conflict

Small conflict