Do you want to insert a `[ resolve conflicts here ]` after the merge command is issued and before you push the branch with the merge results back to the origin? Not sure if it clarifies things to indicate that this is where the "significant work" occurs in the process.