remove merge conflict @minor
Bump version: 0.8.8 → 0.8.9