resolve merge