branch test
and simple
&simple
conflict fixed
test git stash list/pop
test the git stash and drop stash@{0}
add feature vulcan
Merge branch 'feature-vulcan'