diff --git a/src/pixi/renderers/WebGLRenderer.js b/src/pixi/renderers/WebGLRenderer.js
index c7a134c..5b6e94d 100644
--- a/src/pixi/renderers/WebGLRenderer.js
+++ b/src/pixi/renderers/WebGLRenderer.js
@@ -166,20 +166,13 @@
 {
 	if(this.contextLost)return;
 	
-<<<<<<< HEAD
-	//clear objects left behind by the previous stage
-	if(!this.__stage) this.__stage = stage
-	if(this.__stage && this.__stage !== stage)
-	{
-		this.checkVisibility(this.__stage, false)
-		this.__stage = stage
-=======
+
+
 	// if rendering a new stage clear the batchs..
 	if(this.__stage !== stage)
 	{
 		if(this.__stage)this.checkVisibility(this.__stage, false)
 		this.__stage = stage;
->>>>>>> fix for rendering different stages
 	}
 	
 	// update children if need be