testfile2 changes made on origin/master
merge from master to mytest2 for testfile2