diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 6aeab93a7d..414358f94e 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -948,14 +948,8 @@ namespace OpenSim
                     IList agents;
                     if (showParams.Length > 1 && showParams[1] == "full")
                     {
-<<<<<<< HEAD
-                        agents = m_sceneManager.GetCurrentScenePresences();
-                    }
-                    else
-=======
                         agents = SceneManager.GetCurrentScenePresences();
                     } else
->>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
                     {
                         agents = SceneManager.GetCurrentSceneAvatars();
                     }
@@ -1036,27 +1030,16 @@ namespace OpenSim
                         MainConsole.Instance.Output("Shared Module: " + module.Name);
                     }
 
-<<<<<<< HEAD
-                    m_sceneManager.ForEachScene(
-                        delegate(Scene scene)
-=======
                     SceneManager.ForEachScene(
                         delegate(Scene scene) {
                         m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
+
                         foreach (IRegionModule module in scene.Modules.Values)
->>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
                         {
-                            m_log.Error("The currently loaded modules in " + scene.RegionInfo.RegionName + " are:");
-                            foreach (IRegionModule module in scene.Modules.Values)
+                            if (!module.IsSharedModule)
                             {
-                                if (!module.IsSharedModule)
-                                {
-                                    m_log.Error("Region Module: " + module.Name);
-                                }
+                                m_log.Error("Region Module: " + module.Name);
                             }
-<<<<<<< HEAD
-                        });
-=======
                         }
                     }
                     );
@@ -1072,7 +1055,6 @@ namespace OpenSim
                         }
                     }
                     );
->>>>>>> a1e9964... Add experimental "OpenSim object memory churn" statistics to output of region console "show stats" command
 
                     MainConsole.Instance.Output("");
                     break;
@@ -1349,7 +1331,7 @@ namespace OpenSim
                     return;
                 }
 
-                m_sceneManager.ForEachScene(
+                SceneManager.ForEachScene(
                     delegate(Scene scene)
                     {
                         SceneObjectPart part = scene.GetSceneObjectPart(id);
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
index 910418634f..f800d49fe1 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs
@@ -109,19 +109,21 @@ namespace OpenSim.Services.Connectors
             if (ret.Count == 0)
                 return null;
 
-            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
+            Dictionary<string, object> folders = (Dictionary<string, object>)ret["FOLDERS"];
+
+            List<InventoryFolderBase> fldrs = new List<InventoryFolderBase>();
 
             try
             {
-                foreach (Object o in ret.Values)
-                    folders.Add(BuildFolder((Dictionary<string, object>)o));
+                foreach (Object o in folders.Values)
+                    fldrs.Add(BuildFolder((Dictionary<string, object>)o));
             }
             catch (Exception e)
             {
                 m_log.DebugFormat("[XINVENTORY CONNECTOR STUB]: Exception unwrapping folder list: {0}", e.Message);
             }
 
-            return folders;
+            return fldrs;
         }
 
         public InventoryFolderBase GetRootFolder(UUID principalID)