add bonus
fix conflict