For you wpf silverlight people who are working with source control that allows merging.What is the best software to use for merging?I am more worried about the xaml then I am the code because this has