Multiple Assemblies
resolved conflicts