just add a new line in dev branch
Merge branch 'dev'