add branch testme
updte README
conflict fixed