mergering conflict