merging with theirs