More conflict resolution again