change on the new_branch
a change on the master
resolved merge
another commit
 this is new
new things
resove conflicts