add README on branch
fix bug ver1.1
merge conflict