fix merge conflicts

src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs

@@ -291,10 +291,5 @@ namespace ICSharpCode.Scripting
 		{
 			throw new NotImplementedException();
 		}
-		
-		public void NotifyComponentRenamed(object component, string newName, string oldName)
-		{
-			throw new NotImplementedException();
-		}
 	}
 }

src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs

@@ -126,10 +126,5 @@ namespace ICSharpCode.WixBinding
 		{
 			return new ArrayList();
 		}
-		
-		public void NotifyComponentRenamed(object component, string newName, string oldName)
-		{
-			throw new NotImplementedException();
-		}
 	}
 }

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/MyTypeFinder.cs

@@ -26,19 +26,21 @@ namespace ICSharpCode.WpfDesign.AddIn
 		
 		public override Assembly LoadAssembly(string name)
 		{
-			if (string.IsNullOrEmpty(name)) {
-				IProjectContent pc = GetProjectContent(file);
-				if (pc != null) {
-					return this.typeResolutionService.LoadAssembly(pc);
-				}
-				return null;
-			} else {
-				Assembly assembly = FindAssemblyInProjectReferences(name);
-				if (assembly != null) {
-					return assembly;
-				}
-				return base.LoadAssembly(name);
-			}
+			#warning fix
+			throw new NotImplementedException();
+//			if (string.IsNullOrEmpty(name)) {
+//				IProjectContent pc = GetProjectContent(file);
+//				if (pc != null) {
+//					return this.typeResolutionService.LoadAssembly(pc);
+//				}
+//				return null;
+//			} else {
+//				Assembly assembly = FindAssemblyInProjectReferences(name);
+//				if (assembly != null) {
+//					return assembly;
+//				}
+//				return base.LoadAssembly(name);
+//			}
 		}
 		
 		Assembly FindAssemblyInProjectReferences(string name)
@@ -52,11 +54,13 @@ namespace ICSharpCode.WpfDesign.AddIn
 		
 		Assembly FindAssemblyInProjectReferences(IProjectContent pc, string name)
 		{
-			foreach (IProjectContent referencedProjectContent in pc.ReferencedContents) {
-				if (name == referencedProjectContent.AssemblyName) {
-					return this.typeResolutionService.LoadAssembly(referencedProjectContent);
-				}
-			}
+			#warning fix
+			throw new NotImplementedException();
+//			foreach (IProjectContent referencedProjectContent in pc.ReferencedContents) {
+//				if (name == referencedProjectContent.AssemblyName) {
+//					return this.typeResolutionService.LoadAssembly(referencedProjectContent);
+//				}
+//			}
 			return null;
 		}