branch test
AND simple
& simple
conflict fixed
add merge
merge with on-ff
add one word
fix bug 101
merged bug fix 101
fix bug 101
merge bug fix 101
delete a line
add hello.py
new addition
add feature valcan
remove hello.py
add vulcan.ph
conflict fixed