Modify file in branch dev
Modify text in branch master
Merge branch 'dev'
Append message-branch dev
Append message-branch master
Fix merge conflict