diff --git a/private/lib/media/mediaRenderers/MediaImage.php b/private/lib/media/mediaRenderers/MediaImage.php
index 54d9d5a..55c83c4 100644
--- a/private/lib/media/mediaRenderers/MediaImage.php
+++ b/private/lib/media/mediaRenderers/MediaImage.php
@@ -6,17 +6,11 @@ class MediaImage implements MediaRendererInterface{
 		$this->id = $id;
 	}
 
-<<<<<<< HEAD
 	public function asText(array $opt = array()){
 		$size = "small";
 		if(sizeof($opt)>0 && array_key_exists("size", $opt)){
 			$size = $opt["size"];
 		}
-=======
-	//NON PUOI DICHIARARE UN asText DIVERSO DA QUELLO DELL'INTERFACCIA!!!!!!!
-// 	public function asText($size){
-	public function asText(){
->>>>>>> branch 'master' of ssh://gitolite@asdynamics.com:50005/projects/fdn2.git
 		return '<img src="'.GUIHandler::getBaseUrl().'getImage.php?id='.$this->id.'&size='.$size.'"/>';
 	}