fix feature conflict
Merge branch 'master' of https://github.com/by-implication/Badger