More conflict fixes.