update build and bump
fix conflict and update version