It looks like you undid a bunch of change hat I committed l sat weekend.  Did you not merge my changes into your repository correctly?