Make "list conflicts" work

Make the "list conflicts" operation work.

There are numerous problems in here, but it does seem to work.
Documentation would be nice