branch test
AND simple
& simplegit merge feature1
conflict fixed
test
fix bug 101
merged bug fix 101