commit c.txt
c in master
fix conflict
commit a