I don't even know why these files keep getting messed up but I'm hoping this fixes things.
Multiple updates to correct git repository errors.