dev
test.txt
dev add test.txt
master commit
confict fixed
add merge
merge with no-ff
fix bug issue 101
fix bug issue-101
issue-101 fixed and stash pop
---