Actually fixed merge issue.