The developer also wants to change something in a.txt...
Merge branch 'develop'

Conflicts:
	a.txt