This option will delete the current conflict and leave the local changes pended in the workspace against the current version. ...