branch test
commit bt master
commit by feature2
commit conflict fixed
commit by dev
merge with no-ff