append one line in branch dev
append one line in branch master
solve the conflict
solve the conflict