More conflict changes.