experiment on new branch with checkout
edit in master
solve conflicts
mv into test1
change README.md
Merge branch 'master' of github.com:zhaoyangliu/test
delete files