add b.txt
modify a.txt
deal conflict