Merge TFS packaging