from mybranch: rm testfile2, modified testfile