Add some stuff.
Add yet more stuff.

Conflicts:

	foo
Conflicts sorted.