merge conflict solfed