More conflict fixes