fix the merge strategy with theirs.