dev add c.txt
merge dev