Merging opton in TFS