add test3 to bb.txt
manually merge bb.txt