the stupid files have stupid changed and should probably not be in the repo depo.  But what do I know.
no conflicts