branch test
gitskills relation is builded
AND simple
& simple
conflict fixed
add merge
merge with no-ff
use fast forward
Merge branch 'dev'