dev 666
dev 777
merge dev --no-ff