MERGING WITH TFS