diff --git a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/SimpleUIRenderer.java b/src/main/java/speiger/src/coreengine/rendering/gui/renderer/SimpleUIRenderer.java
index e9584fb..d26a187 100644
--- a/src/main/java/speiger/src/coreengine/rendering/gui/renderer/SimpleUIRenderer.java
+++ b/src/main/java/speiger/src/coreengine/rendering/gui/renderer/SimpleUIRenderer.java
@@ -56,79 +56,48 @@ public class SimpleUIRenderer implements IUIRenderer, AutoCloseable {
 	}
 	
 	@Override
-<<<<<<< HEAD
-	public void pushTransform() { transformCache.push(); }
-=======
 	public void pushTransform() {
 		transform.push();
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void popTransform() { transformCache.pop(); }
-=======
 	public void popTransform() {
 		transform.pop();
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void translate(float z) { transformCache.translateZ(z); }
-=======
 	public void translate(float z) {
 		transform.translate(0, 0, z);
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void translate(float x, float y) { transformCache.translate(x, y); }
-=======
 	public void translate(float x, float y) {
 		transform.translate(x, y);
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void translate(float x, float y, float z) { transformCache.translate(x, y, z); }
-=======
 	public void translate(float x, float y, float z) {
 		transform.translate(x, y, z);
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void scale(float scale) { transformCache.scale(scale); }
-=======
 	public void scale(float scale) {
 		transform.scale(scale);
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void scale(float x, float y) { transformCache.scale(x, y, 1F); }
-=======
 	public void scale(float x, float y) {
 		transform.scale(x, y, 1F);
 		invalidateMatrix();
 	}
 	
->>>>>>> branch 'master' of ssh://git@git.speiger.com/Speiger/SimpleJavaEngine.git
 	@Override
-<<<<<<< HEAD
-	public void rotate(Quaternion rotation) { transformCache.rotate(rotation); }
-=======
 	public void rotate(Quaternion rotation) {
 		transform.rotate(rotation);
 		invalidateMatrix();