More conflict resolution junk