cat1 say
ADD cat1
cat2 say
Merge branches 'cat1' and 'cat2' into cat1
MASTER
Merge branches 'master' and 'cat1'

Conflicts:
	123.txt