levels ok + bonus
fix conflict