dev commit
dev2 commit
conflict fixed
merge with no-ff