Improve conflict solver to take into account the initial documents.

This documents have equal bodies but different revisions. In such case
we should just resort to the db winner strategy.
Integrity agent checks for conflicts on startup and intitiates the cleanup.