delete: a
add new line: b
Merge branch 'master' of github.com:guess0717/gittest