Add the cleanup of conflicts structures.
Cleanup temporary db as well.