Unselect the value and focus the editor
resolved conflict