Update a.txt

Conflicts:
	b/a.txt