Resolve merge error