branch test
AND simple
& simple
conflict fixed
1
2
no change
add merge
merge with no-ff
fix bug 101
merge bug fix 101
add a helle.py
may be a conflict