bug fixed a
Merge branch 'bugfix-a'
new line
Merge branch 'bugfix-a' into develop
add a new line
Merge branch 'develop'