Fix Merge issue.