diff --git a/GeneralMods/Revitalize/Framework/Graphics/TextureManager.cs b/GeneralMods/Revitalize/Framework/Graphics/TextureManager.cs
index 1e8ae14a..780ad4d7 100644
--- a/GeneralMods/Revitalize/Framework/Graphics/TextureManager.cs
+++ b/GeneralMods/Revitalize/Framework/Graphics/TextureManager.cs
@@ -24,19 +24,12 @@ namespace Revitalize.Framework.Graphics
         {
             this.name = Name;
             this.textures = new Dictionary<string, Texture2DExtended>();
-            this.searchForTextures();
         }
 
-        public TextureManager(bool doNothing=false)
+        public TextureManager(string Name,IContentPack ContentPack)
         {
+            this.name = Name;
             this.textures = new Dictionary<string, Texture2DExtended>();
-            //
-        }
-
-        public TextureManager(IContentPack ContentPack)
-        {
-            this.textures = new Dictionary<string, Texture2DExtended>();
-            this.searchForTextures(ContentPack);
         }
 
         public void addTexture(string name, Texture2DExtended texture)
diff --git a/GeneralMods/Revitalize/ModCore.cs b/GeneralMods/Revitalize/ModCore.cs
index e584a55c..7cb17ae5 100644
--- a/GeneralMods/Revitalize/ModCore.cs
+++ b/GeneralMods/Revitalize/ModCore.cs
@@ -140,19 +140,17 @@ namespace Revitalize
             ModHelper.Events.GameLoop.ReturnedToTitle += this.GameLoop_ReturnedToTitle;
             playerInfo = new PlayerInfo();
 
-<<<<<<< HEAD
             Framework.Graphics.TextureManager.AddTextureManager(Manifest,"Furniture");
             TextureManager.GetTextureManager(Manifest,"Furniture").searchForTextures();
 
             //TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png")));
-=======
+
             //Framework.Graphics.TextureManager.TextureManagers.Add("Furniture", new TextureManager(this.Helper.DirectoryPath, Path.Combine("Content", "Graphics", "Furniture")));
-            Framework.Graphics.TextureManager.TextureManagers.Add("Furniture", new TextureManager());
             //Rename graphic files tohave spaces and comment out below lines
 
             //TextureManager.addTexture("Furniture","Oak Chair", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content","Graphics","Furniture", "Chairs", "Oak Chair.png")));
             //
->>>>>>> 596aedac77fc182f58bd38415ed86de0b1a6483e
+
             //TextureManager.addTexture("Furniture", "Oak Table", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Tables", "Oak Table.png")));
             //TextureManager.addTexture("Furniture", "Oak Lamp", new Texture2DExtended(this.Helper, this.ModManifest, Path.Combine("Content", "Graphics", "Furniture", "Lamps", "Oak Lamp.png")));
             customObjects = new Dictionary<string, CustomObject>();