bravo
adfa
conflict fixed
empty
play A
plan b
merge with no-ff