create dev branch
simple branch
& simple
conflict fixed
add merge dev
merge with no-ff
add master modify
modify bug
merge issue-101
finish dev task
conflict fixed
add conflict.txt
add dev
add master
conflict fixed