resolve problem of merge