re merge