removed missed conflict
Merge pull request #25 from blaketmiller/blake

removed missed conflict