Description of resolving conflicts 5 illustration

This figure shows that the right action is to copy the content from the left to the right pane.