title: Merging 2 CRM 2011 unmanaged solutions
body: <p>We are working a project jointly with another consulting firm.  For the most part we each have our own domains, but there is a little crossover.</p>
  
  <p>Let's say we both modify an entity that has conflicting changes.  Using the "last one in wins" rule, whichever solution is imported last will have its change implemented.  </p>
  
  <p>Is there a tool or some known methodology for identifying these conflicts before the import is done to help us manage this problem?</p>