commit branch1 :add b1.txt
fix the problem
modified b1.txt
fix in branch fix2
fix the #53 problem
solve the conflict