add dev branch
modify on feature1 branch
modify on master branch
conflict fixed
conflict fixed
modify bug
merged bug fix 101