add <master, 1>
add <branch, 2>
add <master, 3>
add <branch1, 3>
Conflicts:
	demo.txt
merge seq=3
add <master, 4>
Merge branch 'master' into branch1

Conflicts:
	demo.txt
add <branch1, 4>