Update c.txt
Update a.txt
Merge remote-tracking branch 'remotes/origin/dev'

Conflicts:
	a.txt
	c.txt