fourth commit
delete df2.txt
committed from git
test2.txt merge conflict, and commit