copy in my edited files in, since there was weirdness in the diffs