Fix problem of merge