fix timestamp stuff, more fallout from bad merge attempt