abcdefg
abdacasdfasdf
abcd
aaa
aaa
Merge branch 'PING'

Conflicts:
	aaa.txt