test for reset
edit the README.md and add a new file LICENSE
add test.txt
remove test.txt
add test.txt
remove test.txt
dev branch test
a dev branch test
a dev branch test 2
conflict fixed