a.txt modified in master "master(2)"
Merge branch 'master' into feature1

Conflicts:
	a.txt