modified file1.txt on master