6A w test.txt
6B w test.txt
Merge branches 'A' and 'B'

Conflicts:
	test.txt