Resolve problem of merging