add 3 to a.txt
Merge branch 'topic'

Conflicts:
	a.txt