branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
hello.py add
branch test
save work
Merge branch 'dev'
And Simple
& simple
merge conflict fixed