Print conflict details with the new infrastructure (bug #11181)