add to branch dev
add to branch feature1
add to master
comment fixed
add to branch dev1
merge with no-ff