branch test
midify add and simple.
& simple.
conflict fixed
dev test
merge with no--ff
issue-101
merge bug issue-101
add new file hello
merge dev
end