edit line
add b2
merged vs b1 branch