file branchtest.txt add one line by A
fix conflict