Revise merge section
Conflict 'new' branch
Modification on master branch
Conflict fixed
Graph