Merging into VisualStudio