show-conflicts now produces a multi-file report