Fixed merge issue.  Should compile properly now.