More conflict resolution