ff
dev m 2nd
dev modify 3rd
merge with no-ff