diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js
index 82d2f3b..f1606f1 100644
--- a/src/pixi/loaders/ImageLoader.js
+++ b/src/pixi/loaders/ImageLoader.js
@@ -95,19 +95,5 @@
         }
     }
 
-<<<<<<< HEAD
-    if(!this.texture.baseTexture.hasLoaded)
-    {
-        var scope = this;
-        this.texture.baseTexture.on('loaded', function() {
-            scope.onLoaded();
-        });
-    }
-    else
-    {
-        this.onLoaded();
-    }
-=======
 	this.load();
->>>>>>> dev
 };

diff --git a/src/pixi/loaders/ImageLoader.js b/src/pixi/loaders/ImageLoader.js
index 82d2f3b..f1606f1 100644
--- a/src/pixi/loaders/ImageLoader.js
+++ b/src/pixi/loaders/ImageLoader.js
@@ -95,19 +95,5 @@
         }
     }
 
-<<<<<<< HEAD
-    if(!this.texture.baseTexture.hasLoaded)
-    {
-        var scope = this;
-        this.texture.baseTexture.on('loaded', function() {
-            scope.onLoaded();
-        });
-    }
-    else
-    {
-        this.onLoaded();
-    }
-=======
 	this.load();
->>>>>>> dev
 };
diff --git a/src/pixi/textures/RenderTexture.js b/src/pixi/textures/RenderTexture.js
index 7820981..21cb301 100644
--- a/src/pixi/textures/RenderTexture.js
+++ b/src/pixi/textures/RenderTexture.js
@@ -82,7 +82,7 @@
     this.baseTexture.hasLoaded = true;
 
     PIXI.Texture.call(this,
-        baseTexture,
+        this.baseTexture,
         new PIXI.Rectangle(0, 0, this.width, this.height)
     );