master00.txt 'a'
temp2: local00.txt 'b'
Merge branch 'master' into temp2