remove conflict version
Merge pull request #77 from baasbox/0.8.2

remove conflict version