accept modification
add 'change to new branch'
it's still on master
fix file merge