branch test
AND simple
$ simple
AND simple
conflict fixed
fix bug 101
merged bug fix 101
dev version
Merge branch 'dev'