create a new branch, modify one file for testing purpose
Merge branch 'testbranch'