test
add one test txt
add
 Changes to be committed:
	modified:   test.txt
	deleted:    test.txt
Merge branch 'removals'
merge
Conflicts:
	test.txt
changed the txt
recover
Merge remote-tracking branch 'github/master'