Started coding from the beginning, using an end2end test. In the
'conceptualspaces' package.

We drove the TDD by looking the next failing part of the end2end test,
and using that to guide which Class then needed to be implemented. For
each class, we started by writing a unit test to drive the development
of the actual code in the class...
fixed merge by removing conflicts as they are not needed anymore anyway.