branch test
user branch commit
master cbranch commit
reflict
on ff test
merge with no-ff