cat.txt add content:Work is a cat.
cat.txt add content:Master is a cat
Merge branch 'work'

Conflicts:
	cat.txt
add three !
Work is a dog
Merge branch 'work'