Delete xxx.txt
new aaa
Merge branch 'master' of github.com:AndreiDev/Github-Flow into aaa
Merge branch 'aaa' of github.com:AndreiDev/Github-Flow into aaa

Conflicts:
	aaa.txt