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