solving conflicts for merge