More conflict logging