More conflict fixups