creating a new
conflict on feature1
old
on branch master modified
add a.txt
issue-101
solve the issue
branch is down