modif de A.txt
resolve confict