I fixed it in the merge - no big deal.