More conflict merging