local xxx
remote xxx update
newest changes
local xxx
remote xxx update
newest changes
another local line
Merge branch 'xxx' of github.com:AndreiDev/Github-Flow into xxx

Conflicts:
	xxx.txt
Merge branch 'xxx'