More speccing of the conflict resolution. Fixed the guava-collections typos. Tidied up the mock-up DSL.