change file testfile3
merge from master branch
changes made on origin/mytest2