modify new-branch1
master
here is new-branch
conflict fixed
fixed issue-101
...
...
after issue-101