resolve merge error