branch test
And simple
& simple
conflict fixed
add max qi
all
merge with dev
test --no-ff
Merge branch 'dev'
Max Qi
again...
test stash