bbbb
ccc
xcxx
cxxccxx
cccc
cc
xxx
xxxxxx
cc
vvv
vvv
ggg
Merge remote-tracking branch 'upstream/master'