Fix problem of merging