The developer changes a.txt again
Merge branch 'pr/4'

Conflicts:
	a.txt