new branch test
Commit on dev
and simple
or simple
conflict fixed
Fix bug 101