update n1
add c.txt:
Merge branch 'test'