before merge
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
aaaaaaaaaaaaaa
Merge remote-tracking branch 'origin/dev'

Conflicts:
	a.txt
	aa.txt
	b.txt
	c.txt
	d.txt