add some new info
add merge
merge with no-ff
add a file named test2.txt
add a gitignore file