change branch
add gitskills
Merge branch 'dev'
AND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug issue-101
fix bug merge