version 1 commit
fixed the bug in file.txt
Merge branch 'master' into verison1
Merge branch 'verison1' into version2
added extra code to version2.txt