branch test
AND simple
& simple
conflict fixed
add merge
fix bug 101
use git stash pop stash@{0}
Merge branch 'dev'