fix apparent typo: File adds a readbytes method, not readall
fix merge conflict