branch b1 1 modify
branch b1 2 modify
master merge branch b1