that is all
dev commit
feature1 commit
master com
ok
hehe
merge with no-ff