Merge branch 'master' into dev
add line at dev branch
delete a blank line at dev branch
merge dev branch