branch test
modify de.txt
change de.txt
Merge branch 'bra1'

Conflicts:
	de.txt
delete
git_rep