local qqq
remote qqq
new local qqq
Merge branch 'qqq' of github.com:AndreiDev/Github-Flow into qqq

Conflicts:
	qqq.txt
another line
Merge branch 'master' of github.com:AndreiDev/Github-Flow into qqq
third line
forth line
last line
Merge branch 'qqq'