merge-conflict
and the selection is Use modified file from merge-conflict), you can merge your changes into the main branch. This will override whatever change is on the main branch, so make sure that you've first included any changes that you want to merge from master and committed them on your local branch before merging.