c
CC
CCC
Merge branch 'joe'

Conflicts:
	c
add d in joe
Merge branch 'joe'
change in master
change d in joe
change d in joe again
change in master again
Merge branch 'joe'

Conflicts:
	d
add e in joe
Merge branch 'joe'