creat a new branch
branch test
and simple
& simple
conflict fixed
& simple
real &
fiexd
fixed issue101
merge bug fix 101