modified file2.txt (v2)
merge remote branch b2