delete a.txt quyennd
add file1.txt in quyennd
file1.txt was resolved conflict