branch test
branch t
add content to master
merger manually
another content for master
for dev
merge manually
feeture1
master add
merge
dev
merge with no-ff