merging conflicting changes