add c.txt
change a.txt in c branch
deal conflict