branch test
AND simple
& simple
conflict fixed
use stash successfully
modified readme.txt