brach test
AND simple
& simple
fix conflict
add merge
merge without fast forward
new hello.py file
fix bug 101
merge bug fix 101
branch test
apply changes to hello.py
update readme.txt
Merge branch 'dev'
add another line
Merge branch 'dev'
change the extension
change to another extention
conflict fixed
try no-ff merge
merge with no-ff