fixing merge conflict
Merge pull request #6 from statsmaths/master

fixing merge conflict