branch test
AND simple
& simple
coflict fixed
add test.txt
modify test.txt in branch devx
add disable Fast Forward
merge with no-ff