MErge conflicts