test --set-upstream
add new line
append test
push and merge dev
Merge branch 'dev' to master