branch test
and simple
&simple
confict fixed
stash1
add .gitignore