branch test
& x
x->y
x->z
conflict fixed