2
3
c
Merge branch 'dev3'

Conflicts:
	a.txt
Merge branch 'dev4'

Conflicts:
	a.txt