modify the file on mybranch
add a file in master
Merge branch 'mybranch'