modify sample.txt at local server
make local branch
modify master at local server
Merge branch 'localbranch'