branch test
modify in dev branch
modify in gh-pages branch
conflict fixed
add a new line