edited i local
edit index.html in branch1
edit index again in b1
new new new
4 news
Merge branch 'master' into b1

Conflicts:
	index.html

 do the merge
change master index
change b1 index
Merge branch 'master' into b1

Conflicts:
	index.html

asdf
b1 change
master change i
Merge branch 'master' into b1

Conflicts:
	index.html

asdf
done
Merge branch 'b1'

Conflicts:
	index.html