add line in dev branch
add line in master branch
merge branch dev to master