changes in b2
fix conflict