Next commit
Adding a space
Merge remote-tracking branch 'remotes/origin/master' into b
Merge remote-tracking branch 'remotes/origin/b'
Merge remote-tracking branch 'remotes/origin/master' into c

Conflicts:
	foo.txt