add C.txt
merge conflict