There was a silly merge issue.