and here we go
I merged it

Conflicts:
	foo.txt