resolve merge issue.