diff --git a/pandora_console/include/graphs/fgraph.php b/pandora_console/include/graphs/fgraph.php
index 6dc0005073..cfdf56e2eb 100644
--- a/pandora_console/include/graphs/fgraph.php
+++ b/pandora_console/include/graphs/fgraph.php
@@ -267,14 +267,11 @@ function area_graph($flash_chart, $chart_data, $width, $height, $color,
 			$agent_module_id,
 			$font,
 			$font_size,
-<<<<<<< HEAD
-			$xaxisname);
-=======
 			$xaxisname,
 			$percentil_values,
 			$threshold_data
 			);
->>>>>>> d3f5a6281... Fixed threshold in interface graphs. Ticket #156
+			
 	}
 	else {
 		$graph = array();