ubah a.txt
Merge branch 'text'

Conflicts:
	a.txt
testdiff