modified:   test.txt add 'be carfully'
modify test.txt  add  'conflict'
modify test.txt del carefully
Merge branch 'other'

Conflicts:
	test.txt
has fixed!
add other
Merge branch 'other'
modify test.txt add trash