Fixes merge issue.