change on the new_branch
a change on the master
resolved merge
another commit
Fixed merge
merge