edit file in new branch
edit same file from master branch
fixe conflict
commit from dev,add new line and edit one origin line
merge with no-ff
fixed bug 01
merged master wish bug-fiexed branch