Create a new branch
Dev modifies
Master modifies
adopt Master
new branch
modifies twice
merge from prod
improve issues
Merge branch 'issue-101'

bug fixed.
fixed conflict